merge of '5a3e35979062f8e60667cd96d53f07e386b51aba'
authorRod Whitby <rod@whitby.id.au>
Wed, 30 May 2007 09:30:07 +0000 (09:30 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 30 May 2007 09:30:07 +0000 (09:30 +0000)
     and '8a4d576b3d74319becbab6ba2aeec2ef416536be'


Trivial merge