K 10
svn:author
V 3
des
K 8
svn:date
V 27
2011-05-05T08:08:18.217392Z
K 7
svn:log
V 71
Merge two upstream patches from vendor branch.  No functional changes.

END