merge 3.3

Tools/hg/hgtouch.py

@@ -7,6 +7,7 @@ syntax of make rules.
 
 In addition to the dependency syntax, #-comments are supported.
 """
+from __future__ import with_statement
 import errno
 import os