[SCM] sord/master: Merge commit 'upstream/0_svn116'

[alessio at users.alioth.debian.org]

Imported Upstream version 0~svn116
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6ec14e30bd30acf50679a030953d8c7cd6d020e5
X-Git-Newrev: e8f65606dd3f0f027f556af54e3e3b3ecfee2e9f

The following commit has been merged in the master branch:
commit e8f65606dd3f0f027f556af54e3e3b3ecfee2e9f
Merge: 6ec14e30bd30acf50679a030953d8c7cd6d020e5 616367d40f71730611babd1efe4c15c98aded90a
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat May 14 17:24:13 2011 +0200

    Merge commit 'upstream/0_svn116'


-- 
sord packaging