Index: stable/10
===================================================================
--- stable/10	(revision 301830)
+++ stable/10	(revision 301831)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r300220,300223