merge of '246b0146c14e51a55e58803f7d5d1db831a78ee0'
authorRod Whitby <rod@whitby.id.au>
Fri, 18 May 2007 00:00:36 +0000 (00:00 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 18 May 2007 00:00:36 +0000 (00:00 +0000)
     and '3c1fbc69e461f4db65d841f9f35904b4720e3a4a'


Trivial merge