xaxa
Merge remote-tracking branch 'origin/windoze' into macosx

Conflicts:
	.gitignore