Merge branch 'ubuntu'
authorRicardo Salveti de Araujo <ricardo.salveti@linaro.org>
Wed, 18 Jul 2012 00:44:55 +0000 (21:44 -0300)
committerRicardo Salveti de Araujo <ricardo.salveti@linaro.org>
Wed, 18 Jul 2012 00:46:42 +0000 (21:46 -0300)
commite40597716e281aad632ecd2b01048cd177c2ed8c
treedfd46ae45b7751f9e9027dd74382572ac2bea471
parent672e9eeac45c6225d43938010e7bf5599ad5a7bc
parentfb3ff4a73c60138c55691d970a6d2c44cfa2a6b5
Merge branch 'ubuntu'

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

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
debian/changelog
debian/control
debian/patches/series