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

The following commit has been merged in the master branch:
commit d5decbde84c3ce2602f5af803222e1149de027d2
Merge: 488b350d514102278171f8e3c5ab4d640acd9f0c 009f2847f8a75ed209d19409929bbb8ee4401123
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Jun 3 14:29:43 2012 +0800

    Merge branch 'dfsg'


-- 
libmediainfo packaging