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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 8ef8e0d5c4085fc8863e86e5cb18e1d0ca24188f
Merge: 015fae951889dfc63f4cd0fa6f2a0bab4b833dda 6d251ac51a1cd3af70dbb85f7373cbb0c97d11df
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Apr 16 10:57:29 2011 +0200

    Merge commit 'upstream/2011.03.14'


-- 
liblivemedia packaging