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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 03119d9ad9b7add3d2739159e1abf6019ad53a99
Merge: f91e14c89062bc85d5b5455d289ae6a436ea1a6f 37c51cb90a714d0ec83eef721885d0c0c98151c7
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 26 12:55:44 2011 +0200

    Merge commit 'upstream/2011.05.25'


-- 
liblivemedia packaging