[rtems commit] Merge branch 'upstream'

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Apr 13 08:57:07 2012 +0200

Merge branch 'upstream'

---