oops
Merge branch 'master' of github.com:jcupitt/nip2

Conflicts:
	ChangeLog
	src/util.c
Merge branch 'master' of github.com:jcupitt/nip2

Conflicts:
	ChangeLog