From c8f6b0286dddadf4ea1f3ab5bbc770933bd10aa9 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Sat, 5 Sep 2009 13:14:59 +0000
Subject: [PATCH] Merge some more

[SVN r56048]
---
 v2/build/project.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2/build/project.py b/v2/build/project.py
index 86a804ee5..b39e768d0 100644
--- a/v2/build/project.py
+++ b/v2/build/project.py
@@ -1,5 +1,5 @@
 # Status: being ported by Vladimir Prus
-# Base revision: 41324
+# Base revision: 42486
 
 # Copyright 2002, 2003 Dave Abrahams 
 # Copyright 2002, 2005, 2006 Rene Rivera 
@@ -899,7 +899,7 @@ Don't know how to combine that with the --build-dir option.""")
                     attributes.set("build-dir", p, exact=1)
             elif explicit_build_dir:
                 self.registry.manager.errors()(
-"""When --build-dir is specified, the 'build-project'
+"""When --build-dir is specified, the 'build-dir'
 attribute is allowed only for top-level 'project' invocations""")
 
     def constant(self, name, value):