Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Tue, 3 Jul 2012 17:00:44 +0000 (19:00 +0200)
committerXavier Boudet <x-boudet@ti.com>
Tue, 3 Jul 2012 17:00:44 +0000 (19:00 +0200)
commitd85f5593f88f4d3451a0a5c39d1552768533edfa
tree583d1e39e07ffbc2561221a9685b280972ce6ac4
parente6b39fa34db26bedde0d426d6c9b09a91d0fb0a6
parent574dca7b2bbb8328fd3ca3fa16042d933fbd02d8
Merge branch 'ubuntu'

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