merge of 635b821d34af0762478f5f451929137a56d1ed1c
authorRod Whitby <rod@whitby.id.au>
Sat, 30 Dec 2006 15:04:00 +0000 (15:04 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 30 Dec 2006 15:04:00 +0000 (15:04 +0000)
     and eda0057e3fe95d1fc551a5edd24a2fc998be43a3


Trivial merge