Merge remote-tracking branch 'brisby/django1.4' into django1.4
authorDiane Trout <diane@ghic.org>
Mon, 21 Oct 2013 21:53:56 +0000 (14:53 -0700)
committerDiane Trout <diane@ghic.org>
Mon, 21 Oct 2013 21:53:56 +0000 (14:53 -0700)

Trivial merge