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

[alessio at users.alioth.debian.org]

Imported Upstream version 7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 17a1a406b82e0c48fb7cff71446e469c01fc5a9c
X-Git-Newrev: 3a9055d2d47c589e55ff75aabb66e9e885e900e9

The following commit has been merged in the master branch:
commit 3a9055d2d47c589e55ff75aabb66e9e885e900e9
Merge: 17a1a406b82e0c48fb7cff71446e469c01fc5a9c fc081e497b5fb9a86bd867f41a1a91e3b1c9ef37
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Jan 23 12:33:56 2011 +0100

    Merge commit 'upstream/7'


-- 
a2jmidid packaging