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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit bf00c8b31f458bcd691d6d7ab8986938673fc9d3
Merge: c387ea2b8f1a101b0561d647483c4d5199d64cce 74394cb0e77bd8eb6bf61481066a103aff2db8f1
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Nov 5 12:42:49 2010 +0100

    Merge commit 'upstream/20100923'


-- 
ghostess packaging