# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1269456293 -3600
# Node ID d70ada7e987d03bd5f47a5ddd9e16aaf3343813f
# Parent  63c6c2d1123c7b22128c3490f65b210ba118552d# Parent  95b7a15b2f057ee31a98ac9e581077c5ce9fdf16
merge with stable

diff -r 63c6c2d1123c -r d70ada7e987d setup.py
--- a/setup.py	Tue Mar 23 17:24:17 2010 -0500
+++ b/setup.py	Wed Mar 24 19:44:53 2010 +0100
@@ -27,10 +27,10 @@
         "Couldn't import standard zlib (incomplete Python install).")
 
 try:
-	import bz2
+    import bz2
 except:
-	raise SystemExit(
-		"Couldn't import standard bz2 (incomplete Python install).")
+    raise SystemExit(
+        "Couldn't import standard bz2 (incomplete Python install).")
 
 import os, subprocess, time
 import shutil