merge of 94a8f6547e9d39dcd4712e33608201293c57b693
authorRod Whitby <rod@whitby.id.au>
Sat, 16 Dec 2006 13:02:25 +0000 (13:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 16 Dec 2006 13:02:25 +0000 (13:02 +0000)
     and a1ac08321d149b2fdf0a8556eee3e9606457d69c


Trivial merge