remove a warning.
Merge branch 'master' of github.com:jmesmon/trifles

Conflicts:
	base.mk
Merge branch 'master' of github.com:jmesmon/trifles
scripts.
Merge branch 'master' of github.com:jmesmon/trifles