diff --git a/Geo/GModelIO_Mesh.cpp b/Geo/GModelIO_Mesh.cpp
index 0e17d2e08e41749c1f36045564eff77c89a253b5..7ac97734ad50f190e9fb001ed4d8e79ef6dc116a 100644
--- a/Geo/GModelIO_Mesh.cpp
+++ b/Geo/GModelIO_Mesh.cpp
@@ -688,9 +688,10 @@ int GModel::readSTL(const std::string &name, double tolerance)
   char buffer[256];
   fgets(buffer, sizeof(buffer), fp);
 
-  // workaround for stupid 3D-DOCTOR software, which uses "solid" to
-  // start its binary files
+  // workaround for stupid tools which use "solid" to start their
+  // binary files
   if(!strncmp(buffer, "solid 3D-DOCTOR", 15)) buffer[0] = 'z';
+  if(!strncmp(buffer, "solid binary STL from Solid Edge", 32)) buffer[0] = 'z';
 
   if(!strncmp(buffer, "solid", 5)){
     // ASCII STL
diff --git a/configure b/configure
index 4e6eb6ef79155d848ce00c500a78b95bf1c512ac..e201f690b86243af35ae12afd8212bae4eb64168 100755
--- a/configure
+++ b/configure
@@ -6113,8 +6113,9 @@ _ACEOF
       BO="${BO} NoDll"
     fi
     if test "x${OCC}" = "xyes"; then
-      GMSH_LIBS="${GMSH_LIBS} -lwinspool -lws2_32"
+      GMSH_LIBS="${GMSH_LIBS} -lwinspool"
     fi
+    GMSH_LIBS="${GMSH_LIBS} -lws2_32"
     if test "x$enable_gui" != "xno"; then
       GMSH_LIBS="${GMSH_LIBS} Fltk/Win32Icon.res"
     fi
diff --git a/configure.in b/configure.in
index 63bc6c200f6de52fff7031bf40f12e40b26b5356..ae44ce5a4f915342694ae649d73f7be19f578500 100644
--- a/configure.in
+++ b/configure.in
@@ -769,8 +769,9 @@ case "$UNAME" in
       BO="${BO} NoDll"
     fi
     if test "x${OCC}" = "xyes"; then
-      GMSH_LIBS="${GMSH_LIBS} -lwinspool -lws2_32"
+      GMSH_LIBS="${GMSH_LIBS} -lwinspool"
     fi
+    GMSH_LIBS="${GMSH_LIBS} -lws2_32"
     if test "x$enable_gui" != "xno"; then
       GMSH_LIBS="${GMSH_LIBS} Fltk/Win32Icon.res"
     fi
diff --git a/doc/TODO.txt b/doc/TODO.txt
index 1f6970ebad1b84c7e46e5e32e6b5a13b69dc9190..21b064eb7e270a9b315cc5fed9c0fcc8b73f3f92 100644
--- a/doc/TODO.txt
+++ b/doc/TODO.txt
@@ -1,4 +1,8 @@
-$Id: TODO.txt,v 1.23 2009-03-29 18:11:54 geuzaine Exp $
+$Id: TODO.txt,v 1.24 2009-04-01 18:50:53 geuzaine Exp $
+
+********************************************************************
+
+make Attractor fields work on general surfaces
 
 ********************************************************************
 
diff --git a/doc/VERSIONS.txt b/doc/VERSIONS.txt
index cc6c67d18c7d2448f23f384432f2d28b91709d9f..118edd6a034db9d14ed639b4d4331c33671cc50d 100644
--- a/doc/VERSIONS.txt
+++ b/doc/VERSIONS.txt
@@ -1,4 +1,4 @@
-$Id: VERSIONS.txt,v 1.43 2009-03-30 08:19:28 geuzaine Exp $
+$Id: VERSIONS.txt,v 1.44 2009-04-01 18:50:53 geuzaine Exp $
 
 2.3.2 (?): optionally copy transfinite mesh contraints during geometry
 transformations.
@@ -413,9 +413,9 @@ Shewchuk's Triangle as an alternative isotropic 2D mesh generator;
 added AngleSmoothNormals to control sharp edge display with smoothed
 normals; fixed random crash for lighted 3D iso surfaces.
 
-1.23: fixed duplicate elements generation + non-matching tetrahedra
-faces in 3D extruded meshes; better display of displacement maps;
-fixed interactive ellipsis construction; generalized boundary
+1.23 (Aug, 2001): fixed duplicate elements generation + non-matching
+tetrahedra faces in 3D extruded meshes; better display of displacement
+maps; fixed interactive ellipsis construction; generalized boundary
 operator; added new explode option for post-processing views; enhanced
 link view behavior (to update only the changed items); added new
 default plugins: Skin, Transform, Smooth; fixed various other small