Index: stable/12
===================================================================
--- stable/12	(revision 353995)
+++ stable/12	(revision 353996)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r352557,353161