diff -Nru migration-assistant-0.6.1/debian/changelog migration-assistant-0.6.3/debian/changelog
--- migration-assistant-0.6.1/debian/changelog	2008-04-07 11:16:23.000000000 -0400
+++ migration-assistant-0.6.3/debian/changelog	2008-05-29 12:22:33.000000000 -0400
@@ -1,3 +1,10 @@
+migration-assistant (0.6.3) hardy-proposed; urgency=low
+
+  * More efficient and less error-prone device substring extraction.
+  * Set the locale to C when using expr (LP: #222690).
+
+ -- Evan Dandrea <evand@ubuntu.com>  Thu, 29 May 2008 12:20:35 -0400
+
 migration-assistant (0.6.1) hardy; urgency=low
 
   * Use + instead of : for a replacement character as it is explicitly
diff -Nru migration-assistant-0.6.1/ma-apply migration-assistant-0.6.3/ma-apply
--- migration-assistant-0.6.1/ma-apply	2008-04-03 16:01:38.000000000 -0400
+++ migration-assistant-0.6.3/ma-apply	2008-05-29 12:10:18.000000000 -0400
@@ -19,11 +19,11 @@
 selection=`echo "$RET" | sed -e 's/, /\n/g'`
 for choice in $selection; do # Microsoft Windows XP Professional (/dev/hda1)
     IFS="$OLDIFS"
-    location=`expr "$choice" : '.*(\(.*\))'` # /dev/hda1
+    location=$(LC_ALL=C expr "$choice" : '.*(\(.*\))') # /dev/hda1
     IFS="$NEWLINE"
     for line in `os-prober`; do
         IFS="$OLDIFS"
-        loc=$(expr match "$line" '\(.*\):.*:.*:.*')
+        loc="${line%%:*}"
         if [ "$location" != "$loc" ]; then
             continue
         fi
diff -Nru migration-assistant-0.6.1/ma-ask migration-assistant-0.6.3/ma-ask
--- migration-assistant-0.6.1/ma-ask	2008-04-03 16:01:38.000000000 -0400
+++ migration-assistant-0.6.3/ma-ask	2008-05-29 12:10:18.000000000 -0400
@@ -20,8 +20,8 @@
 tmp=
 for line in `os-prober`;
 do
-    dist=$(expr match "$line" '.*:\(.*\):.*:.*')
-    location=$(expr match "$line" '\(.*\):.*:.*:.*')
+    dist=$(LC_ALL=C expr match "$line" '.*:\(.*\):.*:.*')
+    location=${line%%:*}
     if [ -z "$tmp" ]; then
         tmp="$dist ($location)"
     else
@@ -39,7 +39,7 @@
 selection=`echo "$RET" | sed -e 's/, /\n/g'`
 for choice in $selection; do # Microsoft Windows XP Professional (/dev/hda1)
     IFS="$OLDIFS"
-    location=`expr "$choice" : '.*(\(.*\))$'` # /dev/hda1
+    location=$(LC_ALL=C expr "$choice" : '.*(\(.*\))$') # /dev/hda1
     IFS="$NEWLINE"
     for line in `os-prober`; do
         IFS="$OLDIFS"
diff -Nru migration-assistant-0.6.1/ma-script-utils migration-assistant-0.6.3/ma-script-utils
--- migration-assistant-0.6.1/ma-script-utils	2008-01-24 04:24:04.000000000 -0500
+++ migration-assistant-0.6.3/ma-script-utils	2008-05-29 12:10:18.000000000 -0400
@@ -21,7 +21,7 @@
 	return 0
     fi
     
-    case `expr match "$1" '.*:.*:\(.*\):.*'` in
+    case `LC_ALL=C expr match "$1" '.*:.*:\(.*\):.*'` in
 	"Windows" )
 	ostype="windowsxp"
         return 0