K 10
svn:author
V 7
matthew
K 8
svn:date
V 27
2014-06-25T14:00:36.521686Z
K 7
svn:log
V 81
Fix mismerge by synching with the version in head.

Approved by:	portmgr (erwin)

END