merge trunk

diff --cc etc/ChangeLog
index 27237ca0f611f60b8589cc39d32777afed828d55,0a1a5b8b8b7fd0ee3e089886b663f711fe1f65ca..4e1f15e913dad761d5a12dcd0dee088196ba9f16
--- 1/etc/ChangeLog
--- 2/etc/ChangeLog
+++ b/etc/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2012-10-14  Kenichi Handa  <handa@gnu.org>
 +
 +      * charsets/JISC6226.map: Re-generated.
 +
+ 2012-10-14  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * compilation.txt (msft): Add error messages in new Studio 2010
+       format.
+ 
  2012-10-11  Kenichi Handa  <handa@gnu.org>
  
        * charsets/CNS-2.map, charsets/CNS-3.map, charsets/CNS-4.map,