Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Fri, 1 Mar 2013 08:05:51 +0000 (09:05 +0100)
committerXavier Boudet <x-boudet@ti.com>
Fri, 1 Mar 2013 08:05:51 +0000 (09:05 +0100)
commit8f2126a70145d3db24b1a1ef83004afac4b56ced
tree60b668bebdbb4853be9f0bbe5aa4472e1cf09ede
parent6436bbdbd27165001d750672951bb0219244a13b
parentf4c576d557c906fd0458a6b1d9352d7c01e55e78
Merge branch 'ubuntu'

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