Merge from private trunk

Daniel Colascione 2012-12-10 Add emacs.res to .bzrignore
Daniel Colascione 2012-12-10 Fix cygw32 build break

diff --cc ChangeLog
index a351872f545ae1cb8589a0f2bdd191c0e5bf2ec6,33a5802ce47478418caba511d51c1524c94713ad..2bb7eab468e41a696f0186f7e29aeb121ee41cd5
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,7 +1,13 @@@
 +2012-12-10  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * configure.ac (HAVE_INOTIFY): Speed up configure-time test.
 +      There's no need to test for any of three inotify functions,
 +      since we use all three.  Check for just the first one.
 +
  2012-12-10  Daniel Colascione  <dancol@dancol.org>
  
+       * .bzrignore: add src/emacs.res.
+ 
        * configure.ac (W32_RES, W32_RES_LINK, WINDRES): Teach the cygw32
        build how to compile Windows resource files; use these variables
        to tell src/Makefile.in how and whether to compile resources.