[1.0.X] Fixed a small reST header glitch in docs/ref/templates/builtins.txt. ...

[1.0.X] Fixed a small reST header glitch in docs/ref/templates/builtins.txt.  This was [9529] on trunk.

Also updated svnmerge.py metadata; all non bugfix changesets from trunk have been applied to 1.0.X.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9640 bcc190cf-cafb-0310-a4f2-bffc1f526a37