Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my51-bug23721


BitKeeper/etc/collapsed:
  auto-union
BUILD/check-cpu:
  Auto merged

BUILD/check-cpu

@@ -28,7 +28,7 @@ check_cpu () {
     fi
 
     # parse CPU flags
-    for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //'`; do 
+    for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //' -e 's/[^a-zA-Z0-9_ ]/_/g'`; do 
           eval cpu_flag_$flag=yes
     done
   else

BitKeeper/etc/collapsed

@@ -33,3 +33,4 @@
 4561bde4qWhz1I8tkItXKex5uniipA
 4562ba016dYH0JzszOqZ8p6psbKfnQ
 45771031yRCoM_ZfONdYchPvVEgLRg
+45ae6628gqKTsUFfnoNExadETVIkbA