[rtems commit] Merge branch 'upstream'

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue May 29 16:19:38 2012 +0200

Merge branch 'upstream'

---