Merge remote branch 'django-mit/master'
authorAlex Dehnert <adehnert@mit.edu>
Mon, 6 Jun 2011 06:37:44 +0000 (02:37 -0400)
committerAlex Dehnert <adehnert@mit.edu>
Mon, 6 Jun 2011 06:37:44 +0000 (02:37 -0400)

Trivial merge