K 10
svn:author
V 3
dfr
K 8
svn:date
V 27
2008-05-08T11:01:46.000000Z
K 7
svn:log
V 52
Merge from the vendor branch and resolve conflicts.

END