[rtems commit] Merge branch 'upstream'

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Jul  2 16:17:48 2012 +0200

Merge branch 'upstream'

---