Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Tue, 7 Aug 2012 09:06:01 +0000 (11:06 +0200)
committerXavier Boudet <x-boudet@ti.com>
Tue, 7 Aug 2012 09:06:01 +0000 (11:06 +0200)
commit433af0dbcaf63b0e5d2e79e2e7671fc58c0fb11c
treefc62ad7fa7c75fc39de1eccd45ac0c0afeeab08e
parent6b1593d508fd8bba321ff51dff065b925f03383b
parentcb826d8335ebb78c2508827701b6b47907b60303
Merge branch 'ubuntu'

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