From 222cc77e528ac83c6af8c88deb31385b0d710cc0 Mon Sep 17 00:00:00 2001
From: Paul McMillan <Paul@McMillan.ws>
Date: Wed, 23 Jun 2010 05:07:02 +0000
Subject: [PATCH] [soc2010/test-refactor] Added svnmerge props

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13390 bcc190cf-cafb-0310-a4f2-bffc1f526a37