Fix broken test.
Merge branch 'master' of github.com:nickpascucci/S3P

Conflicts:
	s3ptest.c