[SCM] swami/master: Merge commit 'upstream/2.0.0+svn389'

[alessio at users.alioth.debian.org]

Imported Upstream version 2.0.0+svn389
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a38e5b8eab47a9056b0276b4a5df9d05076b8d48
X-Git-Newrev: 8c1f0e71da5ee6258811651b95d2fa9c88fe95e6

The following commit has been merged in the master branch:
commit 6414730da59f074e4e4658945e49247a0590812e
Merge: a38e5b8eab47a9056b0276b4a5df9d05076b8d48 c9bba81ab0375a532c6c9140175df6b9afa329a5
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Feb 12 21:15:29 2012 +0100

    Merge commit 'upstream/2.0.0+svn389'


-- 
swami packaging