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

[hyperair at users.alioth.debian.org]

Merge branch 'upstream' into dfsg
Imported Upstream version 0.7.57
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 5094fa85fafffb1ae9d58c30b93f247d7687f950
Merge: baf332095fb6b6cf7e1065558cf8d27cddd08701 735d0969c53970a83ee713f13bb387147c09f24b
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Thu May 24 23:55:03 2012 +0800

    Merge branch 'dfsg'


-- 
mediainfo packaging