Index: stable/12
===================================================================
--- stable/12	(revision 366360)
+++ stable/12	(revision 366361)

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