--- a/mercurial/patch.py	Fri Sep 20 09:16:07 2013 -0400
+++ b/mercurial/patch.py	Tue Sep 24 15:10:32 2013 -0400
@@ -8,6 +8,10 @@
 
 import cStringIO, email, os, errno, re, posixpath
 import tempfile, zlib, shutil
+# On python2.4 you have to import these by name or they fail to
+# load. This was not a problem on Python 2.7.
+import email.Generator
+import email.Parser
 
 from i18n import _
 from node import hex, nullid, short