[SCM] foo-yc20/master: Merge commit 'upstream/1.2.0'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0fabb3b4b25b48d584d00d70e59d6d71fa486220
X-Git-Newrev: 07606882357b5a41b440e4efd64beabbe0b775de

The following commit has been merged in the master branch:
commit 07606882357b5a41b440e4efd64beabbe0b775de
Merge: 0fabb3b4b25b48d584d00d70e59d6d71fa486220 d3c811f8a1279f3482041f60f03b7289389160c0
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jan 20 20:43:57 2011 +0100

    Merge commit 'upstream/1.2.0'


-- 
foo-yc20 packaging