merge of '0a81de11f045dd65f6ea4c630250337cc8f718b2'
authorRod Whitby <rod@whitby.id.au>
Fri, 30 Nov 2007 11:41:06 +0000 (11:41 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 30 Nov 2007 11:41:06 +0000 (11:41 +0000)
     and '0dbb48946ab15c0ee9c232d1a1fc31e5b65037cd'


Trivial merge