Merge branch 'bq27000-2.6.34' into om-gta02-2.6.34
authorLars-Peter Clausen <lars@metafoo.de>
Mon, 17 May 2010 23:01:47 +0000 (01:01 +0200)
committerLars-Peter Clausen <lars@metafoo.de>
Mon, 17 May 2010 23:01:47 +0000 (01:01 +0200)

Trivial merge