Merge commit 'origin/templates_update'
authorChris Butler <chrisb@crustynet.org.uk>
Fri, 10 Sep 2010 13:22:13 +0000 (14:22 +0100)
committerChris Butler <chrisb@crustynet.org.uk>
Fri, 10 Sep 2010 13:22:13 +0000 (14:22 +0100)

Trivial merge