[rtems commit] Merge branch 'upstream'

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Apr 11 11:20:48 2012 +0200

Merge branch 'upstream'

---