#
#
# patch "INSTALL"
#  from [df6a35fc0a52cf22d8a971f021a173218c0554ee]
#    to [aaca8716964291d0a99d8d299a67438c402fa515]
# 
# patch "win32/tester-plaf.cc"
#  from [ebbaac9b027e0bf19f7569a3c11071988775fa33]
#    to [a6296e0e1f6b678ba609dffec23896806b37acc2]
#
============================================================
--- INSTALL	df6a35fc0a52cf22d8a971f021a173218c0554ee
+++ INSTALL	aaca8716964291d0a99d8d299a67438c402fa515
@@ -233,7 +233,7 @@ 1. prerequisites:
                boost-devel-1.33.1
                libsqlite3-devel-3.6.2
                libidn-devel-1.9
-               gettext-0.17
+               gettext-devel-0.17
                zlib-1.2.3
                perl-5.10.0
                botan-1.8.2
============================================================
--- win32/tester-plaf.cc	ebbaac9b027e0bf19f7569a3c11071988775fa33
+++ win32/tester-plaf.cc	a6296e0e1f6b678ba609dffec23896806b37acc2
@@ -202,7 +202,18 @@ void run_tests_in_children(test_enumerat
 
       DWORD end_millis = GetTickCount();
       if (cleanup(t, status, (end_millis - start_millis) / 1000, -1))
-        do_remove_recursive(testdir);
+        try
+          {
+            do_remove_recursive(testdir);
+          }
+        catch (...)
+          {
+            // process_wait sometimes returns before releasing the lock on
+            // the directory that we tried to remove. So wait a little
+            // longer and try again.
+            Sleep (1000);// milliseconds
+            do_remove_recursive(testdir);
+          }
     }
 }