Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1


configure.in:
  merge fix

configure.in

@@ -20,6 +20,7 @@ SHARED_LIB_MAJOR_VERSION=16
 SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
 NDB_SHARED_LIB_MAJOR_VERSION=3
 NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
+
 # Set all version vars based on $VERSION. How do we do this more elegant ?
 # Remember that regexps needs to quote [ and ] since this is run through m4
 MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`