[rtems commit] Merge branch 'upstream'

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Apr 20 14:08:16 2012 +0200

Merge branch 'upstream'

---