Merge branch 'qt3_drop'
authorDidier Raboud <odyx@debian.org>
Sun, 10 Jun 2012 21:15:34 +0000 (23:15 +0200)
committerDidier Raboud <odyx@debian.org>
Sun, 10 Jun 2012 21:15:34 +0000 (23:15 +0200)

Trivial merge