merge of '934474afbdfdccb4dcb3386a4a6534ee50be8048'
authorRod Whitby <rod@whitby.id.au>
Mon, 12 Mar 2007 17:17:21 +0000 (17:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 12 Mar 2007 17:17:21 +0000 (17:17 +0000)
     and 'e21a13a5c2839e6b4dca88381311f3d1610fb8b8'


Trivial merge