Merge branch 'dbs/template-toolkit-integration' into dbs/template-toolkit-integration...
authorDan Scott <dan@coffeecode.net>
Wed, 29 Jun 2011 14:00:59 +0000 (10:00 -0400)
committerDan Scott <dan@coffeecode.net>
Wed, 29 Jun 2011 14:00:59 +0000 (10:00 -0400)

Trivial merge