Merge tag 'upstream/4.2.0'

Upstream version 4.2.0

# gpg: Signature made Sun 03 Mar 2013 10:14:45 EST using DSA key ID 3D08B612
# gpg: Oops: keyid_from_fingerprint: no pubkey
# gpg: Good signature from "Mark Purcell <msp@debian.org>"
# gpg:                 aka "Mark Purcell <mark@purcell.id.au>"