K 10
svn:author
V 6
eadler
K 8
svn:date
V 27
2013-12-07T23:00:33.930104Z
K 7
svn:log
V 83
Update the merging chapter and explain the new merging policy.

Reviewed by:	peter

END