[rtems commit] Merge branch 'upstream'

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri May 11 14:18:21 2012 +0200

Merge branch 'upstream'

---