merge of '824a2834a0da85846fd46c99800d62eb14ebe522'
authorRod Whitby <rod@whitby.id.au>
Fri, 7 Sep 2007 10:11:42 +0000 (10:11 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 7 Sep 2007 10:11:42 +0000 (10:11 +0000)
     and '93d42c42fbac9beca66c0c236f2fb48801155c94'


Trivial merge