Imported Upstream version 0.4.2
Merge tag 'upstream/0.4.2'

Upstream version 0.4.2

# gpg: Signature made Thu 27 Feb 2014 02:19:26 PM EST using DSA key ID 3AC5C19E
# gpg: Good signature from "Nicolas Bouillot <nicolas.bouillot@gmail.com>"
preparing 0.4.2 for precise