Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Wed, 4 Apr 2012 12:14:00 +0000 (12:14 +0000)
committerXavier Boudet <x-boudet@ti.com>
Wed, 4 Apr 2012 12:14:00 +0000 (12:14 +0000)
commitdd3a5435e6c174db86efea3678c035f1580bb17d
tree879b64a3bc62f9c6d59fe23482fd5ed765bc2bb8
parent0d7d99947bb525b3c6ecf6cb20a747e20849618f
parent8242e4674a2c846e4b0703c42723853d4f2fc90d
Merge branch 'ubuntu'

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