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

[hyperair at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit a0cfd2948a59d4bba32099e295c012f52df772cd
Merge: 41ea7ed05f0801bc1526c798893fae5134c0b9fb 3175796a2970fcdb0ad2b69014909309ff98ee5b
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Aug 19 20:40:30 2012 +0800

    Merge branch 'dfsg'


-- 
mediainfo packaging