Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Thu, 5 Apr 2012 07:50:14 +0000 (07:50 +0000)
committerXavier Boudet <x-boudet@ti.com>
Thu, 5 Apr 2012 07:50:14 +0000 (07:50 +0000)
commit0c55f3712832e1129f2869f636fd18cfacb459aa
treebe5d08a95cc69e34e332e0ffa79d1321cb1238a7
parentc7e64a444c9f2a42a02a4a2d4db0dba526a500ef
parentd7be0c1ef076f6960abeb17335e587b598dcab68
Merge branch 'ubuntu'

Conflicts:
debian/changelog
debian/patches/series

Signed-off-by: Xavier Boudet <x-boudet@ti.com>
debian/changelog
debian/patches/series