Bug#814862: fix for qt4 Conflicts

[Gianfranco Costamagna]

control: tags -1 pending


Hi Ian!
>Gianfranco, can you take a look at this in alioth git and upload the 

>package if you are happy?


I added a patch to fix a build failure, rebased the changelog, tested, signed
and uploaded :)

thanks!

G.