Merge branch 'master' into for-next
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Sun, 23 Jan 2011 11:38:28 +0000 (12:38 +0100)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Sun, 23 Jan 2011 11:38:28 +0000 (12:38 +0100)

Trivial merge