--- a/mercurial/demandimport.py Mon Jul 25 20:46:30 2011 -0500 +++ b/mercurial/demandimport.py Tue Mar 01 23:35:22 2011 -0600 @@ -137,6 +137,8 @@ # raise ImportError if x not defined '__main__', '_ssl', # conditional imports in the stdlib, issue1964 + 'rfc822', + 'mimetools', ] def enable():