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

[hyperair at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 33f12831f248ecd7ccfebcea4f6ab30859a2bea5
Merge: 0e2bee3851a62ecda8bd4ba8a59fa7bca74cbf97 97f226fe52887a88a43752c52c6c1db279b30aeb
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Apr 22 20:56:47 2012 +0800

    Merge branch 'dfsg'


-- 
mediainfo packaging