merged openjpip changes from trunk
Merge branch 'master' of github.com:ksclarke/openjpeg