Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Wed, 31 Jul 2013 08:22:52 +0000 (10:22 +0200)
committerXavier Boudet <x-boudet@ti.com>
Wed, 31 Jul 2013 08:22:52 +0000 (10:22 +0200)
commita9c7a1bb538393cf8680b3689beb9f1484b16164
tree8b5da0cfa7a1c6e64478dc7fbe009da16b5d8945
parent8a6c02b7f13cba4ce639b5cedb6a8a38ca4da404
parent238efc4e61a23faf5d940aa9fa292ffef6cdfbfd
Merge branch 'ubuntu'

Conflicts:
debian/changelog