[SCM] ladish/master: Merge commit 'upstream/1'

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 42f4ba2065f75ed3af1cc099683497c47bf9538e
Merge: f3dede87735e4fccb774f5284b06e3eac57e4453 4ee3e6988794ee6c2ce3b05744132d8ca26fb882
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Dec 31 11:09:52 2011 +0100

    Merge commit 'upstream/1'


-- 
ladish packaging