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

[alessio at users.alioth.debian.org]

Imported Upstream version 2.0~rc1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 94fb8475e352d2d00644a2a3130def7d5b7e5731
X-Git-Newrev: fc6075f89a49ed16555d93ad0518b7fbb3dac81f

The following commit has been merged in the master branch:
commit fc6075f89a49ed16555d93ad0518b7fbb3dac81f
Merge: 94fb8475e352d2d00644a2a3130def7d5b7e5731 03af87529b0c67cd354a93edf5e587db9cb1fef6
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Dec 3 17:33:02 2011 +0100

    Merge branch 'upstream'


-- 
muse packaging