Merge branch 'master' of ssh://einstein/~/public_html/code/git/cookbook

diff --cc cookbook/server.py
index 839afa2f4f0437a34ea52bbded9ea6fccde2af9f,580813c030bfb539d929a03afdd2354930f9183c..516d6616f8aa9fb65f60706e1a84067defc2cdce
--- 1/cookbook/server.py
--- 2/cookbook/server.py
+++ b/cookbook/server.py
@@@ -18,9 -18,10 +18,11 @@@
  """Serve cookbooks over HTTP.
  """
  
+ from __future__ import with_statement
+ 
  import os
  import random
 +import re
  import types
  from xml.sax import saxutils