Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Thu, 18 Apr 2013 08:23:25 +0000 (10:23 +0200)
committerXavier Boudet <x-boudet@ti.com>
Thu, 18 Apr 2013 08:23:25 +0000 (10:23 +0200)
commite4024273dcf4d8a0c4634ec05b8adf2f31b106ee
tree73a89995f3574fdb69a96fbf1f01d6dd77dcbeae
parente58f26253de4f09b2688500c1ac8d20a520f9603
parent5ab6640ea15e7ab02e6ea120442671fa083e9f8d
Merge branch 'ubuntu'

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