merge of 'bed1f45d5c2e76fbd336580d09caef10c613f256'
authorRod Whitby <rod@whitby.id.au>
Thu, 27 Dec 2007 22:31:14 +0000 (22:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 27 Dec 2007 22:31:14 +0000 (22:31 +0000)
     and 'fbb56d5a76093891efdc7abc682059fd0436d4be'


Trivial merge