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)
commitdd1225cc08c3375bf80289ac1965c724881b149a
tree8efa718dc10bb29cd668ed7a84851eab8ed6679e
parente23313fc76e2724fe56354526275458a0bdc10c3
parentd63ade17a0274b3b3f662fa381c4bb496bbf2ca9
Merge branch 'gta02-machine-2.6.34' into om-gta02-2.6.34