merge of '2e36446703200c483d26de29cbaa4a5269fbc5a6'
authorRod Whitby <rod@whitby.id.au>
Sat, 10 Mar 2007 19:21:49 +0000 (19:21 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 10 Mar 2007 19:21:49 +0000 (19:21 +0000)
     and '32536525315e3cb31c5dd980b055f0ecb13acead'


Trivial merge