[SCM] jcgui/master: Merge commit 'upstream/0.7+dfsg0'

[alessio at users.alioth.debian.org]

Repack upstream tarball to get rid of the 'waf' blob (Closes: #654479).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f86b5defae4f2a414c2da052582935d2c7dfc40e
X-Git-Newrev: 25e7a07ddd908d29f49fb042ad917507448183a8

The following commit has been merged in the master branch:
commit 5454590bd3dabdc51ef9e0e476580687190bed3c
Merge: f86b5defae4f2a414c2da052582935d2c7dfc40e 79c78943aa443f4857a75ac16b7b2aea5d8669ca
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 10 13:05:41 2012 +0100

    Merge commit 'upstream/0.7+dfsg0'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/copyright
    	debian/rules


-- 
jcgui packaging