merge of '641cb531f5b8a986da7de7e34632a36c15b6c3ca'
authorRod Whitby <rod@whitby.id.au>
Sat, 29 Mar 2008 03:00:12 +0000 (03:00 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 29 Mar 2008 03:00:12 +0000 (03:00 +0000)
     and 'd3bc42a7b3cb02bf7be09e8aae8fd99960be84b7'


Trivial merge