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

[hyperair at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 801343294826e9d613d6c872e78e909ab52d6495
Merge: 09fceca6a09741d1a919a508848d998db80ce373 1fd7295050840aca9eabe152b3cde20a14c98ba9
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Jun 3 15:19:45 2012 +0800

    Merge branch 'dfsg'


-- 
mediainfo packaging