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

[alessio at users.alioth.debian.org]

Imported Upstream version 0~svn156
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0771cd51906b81e206321d4c0ba127e214b136bc
X-Git-Newrev: 5ed0e00a5e5b8c995ce8d562baefe02e804cd135

The following commit has been merged in the master branch:
commit 95c064d8beb9d1611d43a95c7357369c6306b183
Merge: 0771cd51906b81e206321d4c0ba127e214b136bc b5aadf53656a0ef3604ad6142bae9568ab027cb8
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed May 4 23:52:04 2011 +0200

    Merge commit 'upstream/0_svn156'


-- 
serd packaging