[rtems commit] Merge branch 'upstream'

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Jun  5 17:46:01 2012 +0200

Merge branch 'upstream'

---