Merge tag 'upstream/1.9.10+20140610git97e0e80b_dfsg'

Upstream version 1.9.10+20140610git97e0e80b~dfsg

# gpg: Signature made Tue Jun 10 13:34:06 2014 UTC using DSA key ID 60B25BF9
# gpg: Good signature from "Adrian Knoth <adi@drcomp.erfurt.thur.de>"
# gpg:                 aka "Adrian Knoth <adi@thur.de>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: F7FF 91E6 2CC4 73AD 5173  8EE4 5BB8 D1BE 60B2 5BF9