Merge branch 'master' into for-next
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Tue, 19 Apr 2011 18:01:00 +0000 (20:01 +0200)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Tue, 19 Apr 2011 18:01:00 +0000 (20:01 +0200)

Trivial merge