Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Wed, 2 May 2012 08:57:24 +0000 (08:57 +0000)
committerXavier Boudet <x-boudet@ti.com>
Wed, 2 May 2012 08:57:24 +0000 (08:57 +0000)
commite67eb3e0f0fe2c4c161ff82800442d95963294d4
tree874ec8ea44dc17806a18c3ec11c82d65a9fcda19
parenta77edab80fe05a67f8796e212aea3baae9b9d039
parentc37847e05eb84a63c11d525d8c7da25d7846e4d1
Merge branch 'ubuntu'

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