Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 806-813)

   - Merge from emacs--rel--22
   - Update from CVS

 * emacs--rel--22  (patch 51-58)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 233-236)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-230

1 files changed, 2 insertions, 1 deletions

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 40f921961ac..280429b5a71 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -147,7 +147,7 @@ LIBS =  $(TLIB0)	\
         $(TLIB1)        \
         $(TLIBW32)      \
         $(TLASTLIB)     \
-        $(WINMM)    \
+        $(WINMM)        \
         $(ADVAPI32)     \
         $(GDI32)        \
         $(COMDLG32)     \
@@ -155,6 +155,7 @@ LIBS =  $(TLIB0)	\
         $(MPR)          \
         $(SHELL32)      \
         $(WINSPOOL)     \
+        $(OLE32)        \
         $(libc)
 
 #