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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 4ae3d98c313c3c1876fe96be69a31b39c37bdf64
Merge: d03e80d321c05a7bee5475ded05cd3bdc59dcd2c baf7580196e2fb90ce3932b6e447abbdb85a536a
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Feb 17 15:33:48 2012 +0100

    Merge commit 'upstream/2012.02.04'


-- 
liblivemedia packaging