[SCM] a2jmidid/master: Merge commit 'upstream/7+dfsg0'

[alessio at users.alioth.debian.org]

Imported Upstream version 7+dfsg0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 33c91cb242ea5df44c578717336079c7ae39a19a
X-Git-Newrev: 2d1b878db1698ba75ad72901d85e65b118158adb

The following commit has been merged in the master branch:
commit 2d1b878db1698ba75ad72901d85e65b118158adb
Merge: 33c91cb242ea5df44c578717336079c7ae39a19a ea0b5fb2e9b80450410ca6016a72ab16478ff9b4
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Jan 4 13:59:09 2012 +0100

    Merge commit 'upstream/7+dfsg0'


-- 
a2jmidid packaging