[rtems commit] Merge branch 'upstream'

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri May  4 13:30:53 2012 +0200

Merge branch 'upstream'

---