Merge branch 'gta02-machine-2.6.34' into om-gta02-2.6.34
authorLars-Peter Clausen <lars@metafoo.de>
Wed, 19 May 2010 17:31:20 +0000 (19:31 +0200)
committerLars-Peter Clausen <lars@metafoo.de>
Wed, 19 May 2010 17:31:20 +0000 (19:31 +0200)

Trivial merge