[SCM] libbluray/master: Merge branch 'upstream'

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

Imported Upstream version 0.0~git20111001.8e5d241
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1f99199eb606543155544c0f2338361778a03eef
X-Git-Newrev: 87505d708f733a8639d9a1e4f33ff2cafa887f49

The following commit has been merged in the master branch:
commit e58063a2c4badfb554c48de09bf00a712ef43a8b
Merge: 1f99199eb606543155544c0f2338361778a03eef bf08eb8735280c954a8adc52dd9dce20cafcdc92
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat Oct 1 16:50:27 2011 -0400

    Merge branch 'upstream'
    
    Conflicts:
    	build-aux/ltmain.sh


-- 
libbluray packaging