From 13e034035016005b4f23c77ff640ac08dd46d89e Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sun, 18 Dec 2011 19:01:43 +0000
Subject: [PATCH] use newer distribute_setup.py

---
 CHANGELOG           | 1 +
 distribute_setup.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index b2589061b..7cec8a45f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Changes between 2.2.1 and 2.2.2.dev
 ----------------------------------------
 
 - make monkeypatch more robust against intermediate dict/env deletions
+- use distribute_setup script defaulting to 0.6.24 if no setuptools is installed
 
 Changes between 2.2.0 and 2.2.1
 ----------------------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index bbb6f3c25..b204902e3 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ except ImportError:
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.19"
+DEFAULT_VERSION = "0.6.24"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"