merge of '495972572e3314f7dbb0b97d3acfdd0cbebc48eb'
authorRod Whitby <rod@whitby.id.au>
Tue, 3 Apr 2007 00:02:10 +0000 (00:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 3 Apr 2007 00:02:10 +0000 (00:02 +0000)
commit583c4aa7a419348a9cee44ee968d35d7a64fbd20
treeea09d3606953cb437cec1782291f7b7d8f483b53
parentb88d329c6442e6a68edae9f3c094ae9ca5b51c52
parentbf0ca5fd1797be8836803d9c96e4297dc5977ab9
Merge ... '495972572e3314f7dbb0b97d3acfdd0cbebc48eb'
     and 'af585eaf4c971b8d572ec4d7df0e1d8812690395'