K 10
svn:author
V 3
des
K 8
svn:date
V 27
2008-08-26T10:44:24.156196Z
K 7
svn:log
V 140
Fix mergeinfo: revert an incorrect merge of r180060, and move r178818
into the directories it affectes (etc and include).

Reviewed by:	jhb

END