Merge branch 'sirf/fixes' into fixes
authorArnd Bergmann <arnd@arndb.de>
Mon, 12 Sep 2011 14:59:37 +0000 (14:59 +0000)
committerArnd Bergmann <arnd@arndb.de>
Mon, 12 Sep 2011 14:59:37 +0000 (14:59 +0000)

Trivial merge