[SCM] composite/master: Merge commit 'upstream/0.006.2+dfsg0'

[alessio at users.alioth.debian.org]

Remove an unnecessary copy of the waf blob (Closes: #654463).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b60da83335df3ab3e6ee46bbabc4e17a2c430841
X-Git-Newrev: fac453845eb37c8fff7905be23dfc61ce767fdbb

The following commit has been merged in the master branch:
commit 705c39485ebf6c652ff02025b8ba019487878022
Merge: 004132dda914c5387392f95e86c11a05e35ea0af 245b63eb3b700643717a2d5a2aa185694ef11bbb
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jan 9 20:16:11 2012 +0100

    Merge commit 'upstream/0.006.2+dfsg0'


-- 
composite packaging