[rtems commit] Merge branch 'upstream'

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    246e23cff2ffff48083fd2bc2b402d644d49d5d6
Changeset: http://git.rtems.org/rtems/commit/?id=246e23cff2ffff48083fd2bc2b402d644d49d5d6

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue May 29 12:26:45 2012 +0200

Merge branch 'upstream'

---