Merge branch 'jk/pack-bitmap'

* jk/pack-bitmap:
pack-bitmap: do not use gcc packed attribute

diff --cc csum-file.h
Simple merge

diff --cc pack-bitmap-write.c
Simple merge

diff --cc pack-bitmap.c
Simple merge