Merge tag 'upstream/0.06' into debian

Upstream version 0.06

# gpg: Signature made Mon 28 Oct 2013 02:55:42 PM CET using DSA key ID 95930EDE
# gpg: Good signature from "Axel Beckert (no legal relevance) <abe@deuxchevaux.org>"
# gpg:                 aka "Axel Beckert (no legal relevance) <abe@noone.org>"
# gpg:                 aka "Axel Beckert (no legal relevance) <xtaran@symlink.ch>"