merge of '0927821eeda6b9984fe915a180f51d49aba58e46'
authorRod Whitby <rod@whitby.id.au>
Wed, 21 Mar 2007 22:51:43 +0000 (22:51 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 21 Mar 2007 22:51:43 +0000 (22:51 +0000)
     and '8ee01e7aef977a6c51cf71b7d11f65f42e0dc413'


Trivial merge