merge of '33abb5c4baf70a48836aa488bb5c4229e5b3d9b8'
authorRod Whitby <rod@whitby.id.au>
Sun, 25 Mar 2007 22:13:27 +0000 (22:13 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 25 Mar 2007 22:13:27 +0000 (22:13 +0000)
     and '33dc2a587b8be8674e81f177135b2766463febfb'


Trivial merge