merge of '0e1ac989492f3e442040490676d2cdb30c4f021e'
authorRod Whitby <rod@whitby.id.au>
Tue, 3 Apr 2007 09:50:24 +0000 (09:50 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 3 Apr 2007 09:50:24 +0000 (09:50 +0000)
     and '66dfc103d9012180e06c8ddc348f24c9120e141a'


Trivial merge