[SCM] a2jmidid/master: Merge commit 'upstream/6+20100828.git60f75d9'

[alessio at users.alioth.debian.org]

Imported Upstream version 6+20100828.git60f75d9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 939d0172b84892bfdbc048ca78906e0bd1cc446d
X-Git-Newrev: f827cf6b84ac454c62c288cbef7ab0740d8799e1

The following commit has been merged in the master branch:
commit f827cf6b84ac454c62c288cbef7ab0740d8799e1
Merge: 939d0172b84892bfdbc048ca78906e0bd1cc446d 9b7b7f45f7cea75fa661c6ad1121e79a6c3fe207
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Jan 12 16:15:12 2011 +0100

    Merge commit 'upstream/6+20100828.git60f75d9'
    
    Conflicts (solved):
    	.gitignore


-- 
a2jmidid packaging