K 10
svn:author
V 6
andrew
K 8
svn:date
V 27
2014-12-21T16:49:42.135397Z
K 7
svn:log
V 62
Add proper guards to the read/write macros and fix a mismerge

END