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

[hyperair at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 9b189280a6708eb01890bfefc020d5b1342101ab
Merge: edd190aff5621f40c2d575e024d981b3ddb07d59 3924aeebeed8714741cbc3b3200c133903e0aaa7
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Tue Sep 4 01:24:01 2012 +0800

    Merge branch 'dfsg'


-- 
libmediainfo packaging