Merge branch 'master' into for-next
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Mon, 14 Mar 2011 22:32:08 +0000 (23:32 +0100)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Mon, 14 Mar 2011 22:32:08 +0000 (23:32 +0100)

Trivial merge