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

[hyperair at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 05acab20dd32873f6f5480b28740dc344d6bc047
Merge: 3e0843ee0f612d398c1ab594e9a1e627166328a2 619ac72c917ca927e884af82d5cbe5daf15a48b9
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Fri Mar 30 00:57:17 2012 +0800

    Merge branch 'dfsg'


-- 
libmediainfo packaging