merge of '95ddd65a9c9a2104b071c450f7b75de0533a9a13'
authorRod Whitby <rod@whitby.id.au>
Tue, 25 Mar 2008 04:00:25 +0000 (04:00 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 25 Mar 2008 04:00:25 +0000 (04:00 +0000)
     and 'e827e49beb99d448d8fffea3f155c549865b2e84'


Trivial merge