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

[hyperair at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit f539526ed5baafcfda14c788fdcc3ccc5eabffd8
Merge: 1f9257f7efd6a97b739d66d7536ee45e8839160e 1f9738a150944c6d36f35d5f89618dc09c42361c
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Wed Jan 25 04:15:51 2012 +0800

    Merge branch 'dfsg'


-- 
libmediainfo packaging