[gupnp-tools/f16] (4 commits) ...fix merge

[Peter Robinson]

Summary of changes:

  a6ed651... Rebuild for new libpng (*)
  7e7a842... 0.8.4 (*)
  63907ca... fix merge (*)
  a5e6ef3... fix merge

(*) This commit already existed in another branch; no separate mail sent