merge of '2f816f2a85616dc662369edb3108bdc9c2705e93'
authorRod Whitby <rod@whitby.id.au>
Mon, 2 Apr 2007 21:18:39 +0000 (21:18 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 2 Apr 2007 21:18:39 +0000 (21:18 +0000)
     and 'e7a4d4e9a0961d043f5fdb44415c51c6b9fcd45e'


Trivial merge