merge of '0c41f3612b1aad220f3804e0288528ad8eba750d'
authorRod Whitby <rod@whitby.id.au>
Mon, 21 May 2007 20:53:23 +0000 (20:53 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 21 May 2007 20:53:23 +0000 (20:53 +0000)
     and '82e43060128c986b8be96797125a37a72d6d6aef'


Trivial merge