Merge branch 'regen'
authorTony Cook <tony@develop-help.com>
Wed, 21 Sep 2011 06:20:11 +0000 (16:20 +1000)
committerTony Cook <tony@develop-help.com>
Wed, 21 Sep 2011 06:20:11 +0000 (16:20 +1000)

Trivial merge