Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Thu, 12 Jul 2012 08:08:26 +0000 (10:08 +0200)
committerXavier Boudet <x-boudet@ti.com>
Thu, 12 Jul 2012 08:20:16 +0000 (10:20 +0200)
commita8f96609ee4493e0f8e40c89eb067dfad3703383
treebd43a83efae9646ca29e23eadca1312afeafb048
parent2724afa777cf11269ac05e6afa77e34338e1f668
parenteccc7265e4a21f7b3df07c9d38beb8aee90e1be6
Merge branch 'ubuntu'

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