[SCM] ghostess/master: Merge commit 'upstream/20100905'

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

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

The following commit has been merged in the master branch:
commit d8a3fd1394f17d5890b8aa81f9b4ddbf4c420455
Merge: 8d3f068dec1221e9e131c7eb787d1fa67b2e9abc ce25e35ab701c8d6ed48d33f5a254f3fdd37846d
Author: Rosea Grammostola <rosea.grammostola at gmail.com>
Date:   Mon Sep 6 14:53:52 2010 +0200

    Merge commit 'upstream/20100905'


-- 
ghostess packaging