cleanup
Merge branch 'master' of http://stash.safehaus.org/scm/gfig/main