Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Fri, 4 Jan 2013 13:35:43 +0000 (14:35 +0100)
committerXavier Boudet <x-boudet@ti.com>
Fri, 4 Jan 2013 13:35:43 +0000 (14:35 +0100)
commit2cbd72eb15b5136ce70d58a0d26badbc5712be7b
tree9e41a61814321b469063b7216e85bf002cebe5a1
parentb9bd2c28e6f49a553b8f9b971388aa86eea92f8d
parentc1153fc5e5e5c417d49051acd2d7a9fd9e503f63
Merge branch 'ubuntu'

Conflicts:
debian/changelog