Merge branch 'depends/rmk/devel-stable' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 19:07:42 +0000 (21:07 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 19:07:42 +0000 (21:07 +0200)

Trivial merge