merge of ac11f26f12bf43c4861e065ce644f72654c7cebd
authorRod Whitby <rod@whitby.id.au>
Fri, 22 Dec 2006 19:49:11 +0000 (19:49 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 22 Dec 2006 19:49:11 +0000 (19:49 +0000)
     and f22de0090079fcc6d7b88e1321dcc693df185a54


Trivial merge