[SCM] guayadeque/master: Merge commit 'upstream/0.3.1_dfsg0'

[alessio at users.alioth.debian.org]

Imported Upstream version 0.3.1~dfsg0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 65e23ac6b4456a0ae3704be7983be85ad0672a3e
X-Git-Newrev: 76f7ab6d2204d5a48de450f2efa3c6cebee1b3a8

The following commit has been merged in the master branch:
commit 7c5c0a7589c09dce014466208ae8767bb9729c12
Merge: 65e23ac6b4456a0ae3704be7983be85ad0672a3e e0efe3c8e110130b4db048b7fc22f1da474fd0c7
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat May 14 12:55:30 2011 +0200

    Merge commit 'upstream/0.3.1_dfsg0'


-- 
guayadeque packaging