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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit b2f4c80b96383d82d1d79f1f188e6b30f4f62182
Merge: 7c00dadb459a37d9ea41d66a24defe99bc41cf65 e47901d22839fce0d52929db2b8afc92e6ffdfc9
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue May 3 12:57:21 2011 +0200

    Merge commit 'upstream/0_svn155'


-- 
serd packaging