Merge branch 'master' into for-next
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Tue, 10 May 2011 21:00:00 +0000 (23:00 +0200)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Tue, 10 May 2011 21:00:00 +0000 (23:00 +0200)

Trivial merge