From e5c62a39467a6ab4f8e1fa8067a975c66651cd3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <tarek@mozilla.com>
Date: Fri, 28 Oct 2011 18:39:34 +0200
Subject: [PATCH] packaging tweaks

---
 MANIFEST.in | 1 +
 setup.py    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 9561fb1..640c868 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1,2 @@
 include README.rst
+include MANIFEST.in
diff --git a/setup.py b/setup.py
index 0f530f8..e68d881 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
-from distutils import setup
+from distutils.core import setup
 
 
 with open('README.rst') as f:
@@ -47,4 +47,4 @@ setup(name='ldappool', version='0.9',
       long_description=README,
       url='https://github.com/mozilla-services/ldappool',
       keywords=['python-ldap', 'ldap', 'pool'],
-      licence="MPL")
+      license="MPL")