# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1176226483 25200
# Node ID 35ad84669ca57b75ce3c567cffe0bd8fd702dfa1
# Parent  1cc5fc1d0994d7ae17ed704b5b17fea43c43f379# Parent  66a3fe30f9fc7ec3d66af1b8f18cce325bbb133a
Merge with crew-stable

diff -r 1cc5fc1d0994 -r 35ad84669ca5 mercurial/templater.py
--- a/mercurial/templater.py	Mon Apr 09 04:57:25 2007 -0300
+++ b/mercurial/templater.py	Tue Apr 10 10:34:43 2007 -0700
@@ -27,7 +27,7 @@
     is treated as name of template file.
 
     templater is asked to expand a key in map. it looks up key, and
-    looks for atrings like this: {foo}. it expands {foo} by looking up
+    looks for strings like this: {foo}. it expands {foo} by looking up
     foo in map, and substituting it. expansion is recursive: it stops
     when there is no more {foo} to replace.