Index: stable/12
===================================================================
--- stable/12	(revision 352253)
+++ stable/12	(revision 352254)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r350993,350997,351079-351080,351082,351090,351101-351102