merge of '44fca3f00b99849433ab5c59c5c84afe7972f8da'
authorRod Whitby <rod@whitby.id.au>
Sat, 7 Apr 2007 22:20:37 +0000 (22:20 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 7 Apr 2007 22:20:37 +0000 (22:20 +0000)
     and '9326c45bf734f0f64666b2f374287570c0154243'


Trivial merge