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

[xtophe-guest at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 0e0954cf3861de926b84fc5449b5ed1d3a4dd6ea
Merge: 4f552530047fadd8c266179505d33b0f845aeccd 2ac43e38094777baa50cea2abd9413dcedb39ed5
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Mon Oct 11 22:11:07 2010 +0100

    Merge commit 'upstream/2010.10.06'


-- 
liblivemedia packaging