From fc779fe55aec84994e7e761c743716ba03484bcc Mon Sep 17 00:00:00 2001
From: Jeremy Dunck <jdunck@gmail.com>
Date: Mon, 25 Jun 2007 19:33:37 +0000
Subject: gis: Merged revisions 5491-5539 via svnmerge from     
 http://code.djangoproject.com/svn/django/trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/newforms/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'django/newforms/forms.py')

diff --git a/django/newforms/forms.py b/django/newforms/forms.py
index 6ebebded4b..1ea1c73d9a 100644
--- a/django/newforms/forms.py
+++ b/django/newforms/forms.py
@@ -159,7 +159,7 @@ class BaseForm(StrAndUnicode):
 
     def as_p(self):
         "Returns this form rendered as HTML <p>s."
-        return self._html_output(u'<p>%(label)s %(field)s%(help_text)s</p>', u'<p>%s</p>', '</p>', u' %s', True)
+        return self._html_output(u'<p>%(label)s %(field)s%(help_text)s</p>', u'%s', '</p>', u' %s', True)
 
     def non_field_errors(self):
         """
-- 
cgit v1.3