[SCM] serd/master: Merge commit 'upstream/0_svn185'

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 6336836afd2d88390f7842ee9c31061028269039
Merge: db256cf4a93d1d5c1eee71e723e1d2d0b2e2ee6b fb3f39717ee6196cf36f4e11d0b85da5e1afbf65
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri May 20 16:22:52 2011 +0200

    Merge commit 'upstream/0_svn185'


-- 
serd packaging