Merge branch 'master' into for-next
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Sun, 20 Mar 2011 15:49:25 +0000 (16:49 +0100)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Sun, 20 Mar 2011 15:49:25 +0000 (16:49 +0100)

Trivial merge