Index: tools/config.py
===================================================================
--- tools/config.py	(revision e31c2c51eaa1f290aa8a17dd380858deb2a7ea92)
+++ tools/config.py	(revision 5a8fbcb97392f7c0b940ef1f854b4979f533bddc)
@@ -34,5 +34,6 @@
 import os
 import re
-import commands
+import time
+import subprocess
 import xtui
 
@@ -225,6 +226,14 @@
 	"Create output configuration"
 	
-	revision = commands.getoutput('bzr version-info --custom --template="{revision_id}" 2> /dev/null')
-	timestamp = commands.getoutput('date "+%Y-%m-%d %H:%M:%S"')
+	timestamp = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+	version = subprocess.Popen(['bzr', 'version-info', '--custom', '--template={clean}:{revno}:{revision_id}'], stdout = subprocess.PIPE).communicate()[0].split(':')
+	
+	if (len(version) == 3):
+		revision = version[1]
+		if (version[0] != 1):
+			revision += 'M'
+		revision += ' (%s)' % version[2]
+	else:
+		revision = None
 	
 	outmk = file(mkname, 'w')
@@ -266,11 +275,12 @@
 			outdf.write(' -D%s=%s -D%s_%s' % (varname, default, varname, default))
 	
-	outmk.write('REVISION = %s\n' % revision)
+	if (revision is not None):
+		outmk.write('REVISION = %s\n' % revision)
+		outmc.write('#define REVISION %s\n' % revision)
+		outdf.write(' "-DREVISION=%s"' % revision)
+	
 	outmk.write('TIMESTAMP = %s\n' % timestamp)
-	
-	outmc.write('#define REVISION %s\n' % revision)
 	outmc.write('#define TIMESTAMP %s\n' % timestamp)
-	
-	outdf.write(' "-DREVISION=%s" "-DTIMESTAMP=%s"\n' % (revision, timestamp))
+	outdf.write(' "-DTIMESTAMP=%s"\n' % timestamp)
 	
 	outmk.close()