Merge potlatch_010 properly.
authorTom Hughes <tom@compton.nu>
Fri, 18 Jul 2008 11:23:34 +0000 (11:23 +0000)
committerTom Hughes <tom@compton.nu>
Fri, 18 Jul 2008 11:23:34 +0000 (11:23 +0000)

Trivial merge