Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Fri, 30 Mar 2012 16:52:18 +0000 (16:52 +0000)
committerXavier Boudet <x-boudet@ti.com>
Fri, 30 Mar 2012 16:52:18 +0000 (16:52 +0000)
commit714b2f5b3fa1d136caa60c9cd9422f1c9307aa2f
tree08b4d7049784baae78402b494714d5ea0bed461f
parent6518b108de402cea3b913c215520c25c567e3514
parent364b38f4e2332345ef7254a854e8e21c57d164d2
Merge branch 'ubuntu'

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