Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Wed, 12 Sep 2012 10:34:11 +0000 (12:34 +0200)
committerXavier Boudet <x-boudet@ti.com>
Wed, 12 Sep 2012 10:34:11 +0000 (12:34 +0200)
commit30205c73456cf5b4ad61aaa78e71944a0d490c12
treec84d97f1cc66cfddffc0f8b48ac0c0f76bc62734
parent255c28b8503e24a9d997a7bf0ac71217723c959b
parent76b089f312eb2853250f98b0d5515b14ef67d298
Merge branch 'ubuntu'

Conflicts:
debian/changelog
debian/rules