[SCM] libmediainfo/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: 982b31cf9085bf26237b23089f3999f38bc4baca
X-Git-Newrev: 5c6d44515e58abeef31420177794f10e138a7317

The following commit has been merged in the master branch:
commit 20304db35bd525bba512c183b356604ac546f923
Merge: 982b31cf9085bf26237b23089f3999f38bc4baca 1ede7d6a624e1c16d579072f33ba3d43e9e1c629
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Thu May 17 00:11:01 2012 +0800

    Merge branch 'dfsg'


-- 
libmediainfo packaging