Merge branch 'ubuntu'
authorOlivier Naudan <o-naudan@ti.com>
Thu, 10 May 2012 13:06:23 +0000 (09:06 -0400)
committerOlivier Naudan <o-naudan@ti.com>
Thu, 10 May 2012 13:06:23 +0000 (09:06 -0400)
commit251cbbff5178b2c4141670fda200739c69090e8c
treec350501469f119d7e0053757efcce631e2121570
parent4c9a64114b21bab51a32a9ad49e8a0d58efde02f
parent7b5c9a04af543ead9dc29786112c6725203291b9
Merge branch 'ubuntu'

Conflicts:
debian/changelog
debian/gbp.conf
debian/libgstreamer.symbols
debian/patches/series
debian/changelog
debian/gbp.conf
debian/libgstreamer.symbols
debian/patches/series
debian/rules