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

[alessio at users.alioth.debian.org]

Revert "Imported Upstream version 0.9"
Imported Upstream version 0.9
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 1cc7478ef6873eb3e3b7e2327a00e0b42a466ad0
Merge: 7fd8f2b1467c8c046da51a83e67b19d4582424be 4cbbe47c0645f73297b0788ccbfd0d2cdc943907
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Oct 25 19:04:08 2010 +0200

    Merge branch 'upstream'


-- 
earcandy packaging