waf and swig
Merge branch 'master' of https://github.com/r9y9/swig-and-waf

Conflicts:
	.gitignore