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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit ee7aeacef4b73ecd4afaea37e51f0a5b6e2f183a
Merge: 2e6de6d81b9c3c3297ae771f62e2043665b667b2 59c82c3359a35ba8f639047e8b59b5fef95dd54f
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jul 26 10:42:08 2011 +0200

    Merge commit 'upstream/2011.07.21'


-- 
liblivemedia packaging