merge of 13bb4c8ba3175c16be87c9c51595f35e125fb447
authorRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 17:47:47 +0000 (17:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 17:47:47 +0000 (17:47 +0000)
     and 2cc566f5ecd1293f846e7d96c9d275142d273fb8


Trivial merge