K 10
svn:author
V 3
des
K 8
svn:date
V 27
2009-10-10T21:10:49.192758Z
K 7
svn:log
V 153
Fix mergeinfo for r196843 (r196518) and r196997 (r196519).

Folks, *please* use 'svn merge' instead of applying patches manually!

Approved by:	re (kib)

END