Packaging: merged changes from the debian package
Authored by: Jean-Francois Dockes 2012-04-06
Parent(s): [34070e]
Child(ren): [0880f4]