Merge branch 'mainline' into upstream-linus
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Sat, 23 Sep 2006 12:34:10 +0000 (14:34 +0200)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Sat, 23 Sep 2006 12:34:10 +0000 (14:34 +0200)

Trivial merge