Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Fri, 4 Jan 2013 12:39:08 +0000 (13:39 +0100)
committerXavier Boudet <x-boudet@ti.com>
Fri, 4 Jan 2013 12:39:08 +0000 (13:39 +0100)
commit20df43160850799ed523bf451f694cdced7a64aa
tree3f4e613ada07f51917fc6b5f9d2f204c9d142dcb
parentd761eee5d7f933ee9a1a96ccda095479f9102394
parent9c357b83b4e1148770eb02d57a232db63dd217c2
Merge branch 'ubuntu'

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