Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Thu, 18 Apr 2013 08:13:31 +0000 (10:13 +0200)
committerXavier Boudet <x-boudet@ti.com>
Thu, 18 Apr 2013 08:13:31 +0000 (10:13 +0200)
commit476dcfb23ba1dec3917fd4e398b4eebac3893061
treec2883fa7e105fe3d3ebdcfa48b6792f384903b31
parent383e42f03b11d42bd940c5781e87ef33e1b11331
parenta36f2ffa139c574aa8cc8d9ddd2c62129b8f9930
Merge branch 'ubuntu'

Conflicts:
debian/changelog