merge of 'bcaae16b49f72fbc56e2ec7aa8633d3f55b36d2f'
authorRod Whitby <rod@whitby.id.au>
Tue, 2 Jan 2007 03:25:55 +0000 (03:25 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 2 Jan 2007 03:25:55 +0000 (03:25 +0000)
     and 'dc166a634d98eed0d4db914b9baa853e0041ee57'


Trivial merge