merge of 67ee830cf5e13981f991348862d52014162c9dcf
authorRod Whitby <rod@whitby.id.au>
Sat, 30 Dec 2006 10:17:20 +0000 (10:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 30 Dec 2006 10:17:20 +0000 (10:17 +0000)
     and bbe0f81068d50c751254355e444d82da046b3a41


Trivial merge