uname -s
Merge branch 'master' of github.com:mapnik/mapnik-packaging into osx-travis

Conflicts:
	.travis.yml