[rtems commit] Merge branch 'upstream'

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Apr  2 14:09:05 2012 +0200

Merge branch 'upstream'

---