merging
Merge branch 'master' of https://github.com/poulenque/Nat-O-Mi

Conflicts:
	0.3/natparser.pyc