reconcile
Merge branch 'master' of http://github.com/RuedigerMoeller/fast-serialization