Merge branch 'fixes' into for-next
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Mon, 2 May 2011 20:56:54 +0000 (22:56 +0200)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Mon, 2 May 2011 20:56:54 +0000 (22:56 +0200)

Trivial merge