Merge branch 'master' into for-next
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Sat, 26 Feb 2011 14:15:21 +0000 (15:15 +0100)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Sat, 26 Feb 2011 14:15:21 +0000 (15:15 +0100)

Trivial merge