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

[alessio at users.alioth.debian.org]

Imported Upstream version 0.3.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 346dff59f20e9bb9d81d80c7140bab8e034c0cbf
X-Git-Newrev: 5ebe7f5d5733572e8800fee3a6c52d53f9dbe63b

The following commit has been merged in the master branch:
commit 5ebe7f5d5733572e8800fee3a6c52d53f9dbe63b
Merge: 346dff59f20e9bb9d81d80c7140bab8e034c0cbf fcf66c40b07ca4807da871d7169b94d089871c65
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat May 14 10:19:32 2011 +0200

    Merge commit 'upstream/0.3.1'


-- 
guayadeque packaging