[rtems commit] Merge branch 'upstream'

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Apr 11 15:28:41 2012 +0200

Merge branch 'upstream'

---