[SCM] liblivemedia/master: Merge commit 'upstream/2011.08.22'

[alessio at users.alioth.debian.org]

Imported Upstream version 2011.08.22
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d04861635a5dc4ed645e97400567c1ada4972035
X-Git-Newrev: da7825aaaca1eca965ca0b11b463a493dd7db0d8

The following commit has been merged in the master branch:
commit da7825aaaca1eca965ca0b11b463a493dd7db0d8
Merge: d04861635a5dc4ed645e97400567c1ada4972035 bab2df388fb7e55ff7f1ae581d491fb8ccf524e1
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Aug 26 17:13:40 2011 +0200

    Merge commit 'upstream/2011.08.22'


-- 
liblivemedia packaging