From 1442ebe1298c9347ce90e042a5adc146de57d2b2 Mon Sep 17 00:00:00 2001
From: Brian Rosner <brosner@gmail.com>
Date: Fri, 18 Jul 2008 23:25:06 +0000
Subject: [PATCH] svnmerge.py init for newforms-admin merge back into trunk.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7964 bcc190cf-cafb-0310-a4f2-bffc1f526a37