merge of '51282322cfa3cd938fb47ab1b7038c115d8024d8'
authorRod Whitby <rod@whitby.id.au>
Mon, 19 Mar 2007 20:46:15 +0000 (20:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 19 Mar 2007 20:46:15 +0000 (20:46 +0000)
     and 'c6af65fae3cef86de384e1203d97c909460bf4fa'


Trivial merge