From 9585cccde553d69ead161f7083cedcb0b323b596 Mon Sep 17 00:00:00 2001
From: Morgan Collett <morgan.collett@gmail.com>
Date: Wed, 26 Mar 2008 10:27:02 +0000
Subject: Merge branch 'master' into update-1 to sync it with Update.1 version released off master

---
(limited to 'setup.py')

--
cgit v0.9.1