[SCM] earcandy/master: Merge commit 'upstream/0.9+bzr12'

[alessio at users.alioth.debian.org]

Imported Upstream version 0.9+bzr12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7fd8f2b1467c8c046da51a83e67b19d4582424be
X-Git-Newrev: 5ec215dd7c801c1884fd1c15df8dbad5ffcf5ac8

The following commit has been merged in the master branch:
commit 5ec215dd7c801c1884fd1c15df8dbad5ffcf5ac8
Merge: c5108ed0bc1b954d1bf6a470306026d8f6ed815c 56261fe404442a92c2b88d519763a7c1c2c85adb
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Oct 25 19:08:19 2010 +0200

    Merge commit 'upstream/0.9+bzr12'
    
    Conflicts solved:
    	debian/changelog
    	debian/compat
    	debian/control
    	debian/copyright
    	debian/rules


-- 
earcandy packaging