Imported Upstream version 0.18.4
Merge tag 'upstream/0.18.4'

Upstream version 0.18.4

# gpg: Signature made sön  2 sep 2012 18:43:41 CEST using DSA key ID BDE5F1EE
# gpg: Good signature from "Andreas Henriksson <andreas@fatal.se>"
# gpg:                 aka "Andreas Henriksson <ah@debian.org>"
# 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: 7451 CC90 2F56 01DB D4D6  78F5 7204 3670 BDE5 F1EE
Update debian/changelog
Merge git://anonscm.debian.org/collab-maint/gupnp

Conflicts:
	debian/changelog