[SCM] zyn/master: Merge commit 'upstream/1+git.20100609+dfsg0'

[alessio at users.alioth.debian.org]

Get rid of the waf blob (Closes: #654513).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ebff93d47953285380fcc92f1ce6f0a331a78de3
X-Git-Newrev: c62a2d994acc835c76d62b3534b8748b63287bd3

The following commit has been merged in the master branch:
commit 68d60cddad1a864cdca179c549daad4d01d940dc
Merge: ebff93d47953285380fcc92f1ce6f0a331a78de3 d83e980a7049072e6d78bc7cc76cb05418277b67
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jan 9 20:38:59 2012 +0100

    Merge commit 'upstream/1+git.20100609+dfsg0'


-- 
zyn packaging