Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Thu, 7 Feb 2013 09:33:24 +0000 (10:33 +0100)
committerXavier Boudet <x-boudet@ti.com>
Thu, 7 Feb 2013 09:33:24 +0000 (10:33 +0100)
commit0935e661720c3e988cf49b8aae9556ecdaedaa0a
tree36d087b60c609ad7613632129686797297d641c1
parentf6a1adfaf5a3a2a16273a0dd830da7d099341697
parentaca1e1cbad5b708cd13c88691b966b00b894e1fc
Merge branch 'ubuntu'

Conflicts:
debian/changelog