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

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

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

The following commit has been merged in the master branch:
commit f2dfceb122316d59fec3b3b77378ed70b6534215
Merge: a88cb5f3fcb67aba7da2dec10ce2c8759c84ce44 feaf4b1b6c07bfa61623a25ea2b4ea9580b9f0b5
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Nov 30 22:43:51 2010 +0100

    Merge commit 'upstream/2010.11.17'


-- 
liblivemedia packaging