Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Tue, 10 Jul 2012 11:30:17 +0000 (13:30 +0200)
committerXavier Boudet <x-boudet@ti.com>
Tue, 10 Jul 2012 11:30:17 +0000 (13:30 +0200)
commit27d619bdbad2f8d27ab4edc6fc4964b4a5682498
treef27f799037eb3239df19209619bf108483f5c7d2
parent0a4c3bad89ae737d644a806237fccc963debdb09
parentd0bb2adfab7935bfc64c9532ae7f2ac7a791d0d6
Merge branch 'ubuntu'

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