Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Wed, 21 Mar 2012 08:29:47 +0000 (08:29 +0000)
committerXavier Boudet <x-boudet@ti.com>
Wed, 21 Mar 2012 08:29:47 +0000 (08:29 +0000)
commit253618e02c310fcdf1dbd5a8dd115a87761cb3be
treed3ff4d55dcc98e75b82ac8f4cbdfd46e0fe27800
parent1e5dcb6e78f6598a0e1571911fa1d6926d80b9d1
parentfc5f22f2edd77aebda1a455542262963fb620d1f
Merge branch 'ubuntu'

Conflicts:
debian/changelog
debian/changelog