Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Thu, 30 Aug 2012 12:59:01 +0000 (14:59 +0200)
committerXavier Boudet <x-boudet@ti.com>
Thu, 30 Aug 2012 12:59:01 +0000 (14:59 +0200)
commitf537615d5940cf5d604a3e127e5fef527d8b3120
treed9462ed3483862d3ba0a8c702b35e8421ca5f705
parentac60fde4aa1a757f54989ad89cbdc2fad15ffd61
parent091d6f8daf330e77d2d03fbd95524dc8e39e9000
Merge branch 'ubuntu'

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