Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Wed, 9 May 2012 07:22:04 +0000 (09:22 +0200)
committerXavier Boudet <x-boudet@ti.com>
Wed, 9 May 2012 07:22:04 +0000 (09:22 +0200)
commit188647ae316921821851c1e210b3908255cdcfc1
treead8bc74064307ea11e2d757ca1a8249a1b686018
parent46fc385f41a6a1a7e377cde09e6eb187e1fc40fb
parentce53fae56b735456907a879557c67cbb30801a0a
Merge branch 'ubuntu'

Conflicts:
debian/changelog
debian/patches/series
debian/changelog
debian/patches/series