Bringing branch up-to-date with trunk

.gitattributes

SConscript

include/zipr_impl.h

src/Makefile.in

src/SConscript

src/ehwrite.cpp

src/elfwrite.cpp

src/zipr.cpp