Merge branch 'ubuntu'
authorOlivier Naudan <o-naudan@ti.com>
Thu, 6 Dec 2012 13:03:37 +0000 (13:03 +0000)
committerOlivier Naudan <o-naudan@ti.com>
Thu, 6 Dec 2012 13:03:37 +0000 (13:03 +0000)
commitc6b27b554cf73c21259c6aab973645612c54745d
tree3dad67a300571e4c8efc72e65e0d7b026a28a841
parent2ebe1b966181c6728cc129556ec7ed6fc249a9ca
parent1ab08f4b9c565745494d212f95a433d8ad1b061f
Merge branch 'ubuntu'

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