[SCM] mediainfo/master: Merge branch 'dfsg'

[hyperair at users.alioth.debian.org]

Merge branch 'upstream' into dfsg
Imported Upstream version 0.7.61
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1fc76233de7eead1cb91fad201068310607f2bf6
X-Git-Newrev: c81f2604cb029f97c5767b8f44dc561f42923f96

The following commit has been merged in the master branch:
commit 451a591131164c52d23327aa96e292edf8c56892
Merge: 1fc76233de7eead1cb91fad201068310607f2bf6 ae34e8cf9225c42ecd06635fa09634ead6bfd5a1
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Oct 28 04:29:38 2012 +0800

    Merge branch 'dfsg'


-- 
mediainfo packaging