merge of '574e65dc4315f62dd912ceca4784d203ccc5fae0'
authorRod Whitby <rod@whitby.id.au>
Thu, 27 Mar 2008 05:31:20 +0000 (05:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 27 Mar 2008 05:31:20 +0000 (05:31 +0000)
     and 'e561ab79ab11a574164c442f9dab7e936c145347'


Trivial merge