merge of '092fad7ac105a9653fa1cad08a75d41fa62f346b'
authorRod Whitby <rod@whitby.id.au>
Tue, 3 Apr 2007 19:39:01 +0000 (19:39 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 3 Apr 2007 19:39:01 +0000 (19:39 +0000)
     and '8d8e263c49102ef84071afcdade56976d489039f'


Trivial merge