[SCM] libmediainfo/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: f7b058979910a0c4b7a1d460842d31b0106ff4f3
X-Git-Newrev: f01472da7eaf2dd921a4b581449fc80ae8979136

The following commit has been merged in the master branch:
commit ea8e115f14f87829fbbac1e88083d9034e85a5d7
Merge: f7b058979910a0c4b7a1d460842d31b0106ff4f3 49ff8b20136e90a40765a59cf3d841964f8f34ec
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Oct 28 04:07:17 2012 +0800

    Merge branch 'dfsg'


-- 
libmediainfo packaging