# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1300360896 -3600
# Node ID 4f9f13a504842fbee042c52b35d414d29629c750
# Parent  8052d2452b9c014a60534018d1be3e9009cece93# Parent  dccc22c60473991314e4d37f9508b215a2362bdf
merge oldstable into default

diff -r 8052d2452b9c -r 4f9f13a50484 devtools/__init__.py
--- a/devtools/__init__.py	Thu Mar 17 12:07:08 2011 +0100
+++ b/devtools/__init__.py	Thu Mar 17 12:21:36 2011 +0100
@@ -703,7 +703,7 @@
     if overwrite or handlerkls.DRIVER not in HANDLERS:
         HANDLERS[handlerkls.DRIVER] = handlerkls
     else:
-        msg = "%s: Handler already exists use overwrite if it's intended\n"
+        msg = "%s: Handler already exists use overwrite if it's intended\n"\
               "(existing handler class is %r)"
         raise ValueError(msg % (handlerkls.DRIVER, HANDLERS[handlerkls.DRIVER]))
 
diff -r 8052d2452b9c -r 4f9f13a50484 server/__init__.py