[rtems commit] Merge branch 'upstream'

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu May 24 18:07:24 2012 +0200

Merge branch 'upstream'

---