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

[alessio at users.alioth.debian.org]

Imported Upstream version 0~svn124
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 965e739d54b0fba685e6040a5cc89b036ca0092e
X-Git-Newrev: 068e19d29e3366437de5333c129a9fe633b0278c

The following commit has been merged in the master branch:
commit 068e19d29e3366437de5333c129a9fe633b0278c
Merge: 965e739d54b0fba685e6040a5cc89b036ca0092e 7fe1a52f7986db40a191fba4cbda16758e64afb3
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri May 20 16:24:52 2011 +0200

    Merge commit 'upstream/0_svn124'


-- 
sord packaging