merge of aca32242c3aeda1deec71cb3492a56279b957c6c
authorRod Whitby <rod@whitby.id.au>
Sat, 23 Dec 2006 19:02:16 +0000 (19:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 23 Dec 2006 19:02:16 +0000 (19:02 +0000)
     and d67f8bd3fed7755a1d32f2af73c8b9150f5836e2


Trivial merge