K 10
svn:author
V 5
gavin
K 8
svn:date
V 27
2010-08-08T19:07:59.705622Z
K 7
svn:log
V 41
Fix mismerge in r211035.

Pointy hat:	me

END