[rtems commit] Merge branch 'upstream'

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Jun  4 10:01:16 2012 +0200

Merge branch 'upstream'

---