Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Thu, 15 Mar 2012 11:13:49 +0000 (11:13 +0000)
committerXavier Boudet <x-boudet@ti.com>
Thu, 15 Mar 2012 11:13:49 +0000 (11:13 +0000)
commite7a2b0b7ec67882c1badf7f59bec8787ce781b90
tree1245319b5f5c5e71bbdafd19407c74cb0e50b0bd
parentb8168117d7891d3ad2199cdce0ae980fbd869a90
parent5cdf753ac483c27cad7dbc409d04014d9e6fb283
Merge branch 'ubuntu'

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