[SCM] gavl/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: 01c5bdf6c81f7f637cd5d8a985a95028811b05b9
X-Git-Newrev: d377f8d8dd7ba6794b1f4ca9c13cd90a8512e246

The following commit has been merged in the master branch:
commit d377f8d8dd7ba6794b1f4ca9c13cd90a8512e246
Merge: 01c5bdf6c81f7f637cd5d8a985a95028811b05b9 451cc07f9477c1da52bbe27b43fa705eadf73f7c
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Jan 9 11:59:08 2011 +0100

    Merge commit 'upstream/1.2.0'


-- 
gavl packaging