Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Tue, 17 Jul 2012 08:21:08 +0000 (10:21 +0200)
committerXavier Boudet <x-boudet@ti.com>
Tue, 17 Jul 2012 08:21:08 +0000 (10:21 +0200)
commit6a992e6b12e56a177376b3e4f812326108259e9b
tree3a86f3c717483b02034b2a68aaa07726ffbb5d36
parent63d97852c7d28d293b85b4e36461563d09ac905c
parentca1ec0d76b151d9adfa31d4d09cec457b2b0e076
Merge branch 'ubuntu'

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