Merge tag 'upstream/3.6.1'

Upstream version 3.6.1

# gpg: Signature made Mon 24 Sep 2012 08:13:42 AM JST using DSA key ID 09C5B094
# gpg: Good signature from "Norbert Preining <preining@debian.org>"
# gpg:                 aka "Norbert Preining <preining@logic.at>"