[rtems commit] Merge branch 'upstream'

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Apr 24 14:23:32 2012 +0200

Merge branch 'upstream'

---