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

[bdrung at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 926b0994eef9f16108f914767de11e57daeed087
Merge: aa904bcfa79445530d446beeb5883fbb67b925ba a77a4ab9b8f432ead913bf45d4dbfd0ce5bdde74
Author: Benjamin Drung <bdrung at debian.org>
Date:   Fri Dec 30 13:17:27 2011 +0100

    Merge commit 'upstream/2011.12.23'


-- 
liblivemedia packaging