diff --git a/[refs] b/[refs]
index 22db95be3052..3852ff074132 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 235caa235cb6f88fd04bc58a288f45463e5361c7
+refs/heads/master: 55c640c3abff301eed5ee11c34a40bfe043c8c2d
diff --git a/trunk/scripts/setlocalversion b/trunk/scripts/setlocalversion
index 64a9cb5556cd..e90a91cc5185 100755
--- a/trunk/scripts/setlocalversion
+++ b/trunk/scripts/setlocalversion
@@ -86,7 +86,7 @@ scm_version()
 
 	# Check for mercurial and a mercurial repo.
 	if hgid=`hg id 2>/dev/null`; then
-		tag=`printf '%s' "$hgid" | cut -d' ' -f2`
+		tag=`printf '%s' "$hgid" | cut -s -d' ' -f2`
 
 		# Do we have an untagged version?
 		if [ -z "$tag" -o "$tag" = tip ]; then