merge of 'a3080faf3a125f45b97d49303612cf6bab9539cd'
authorRod Whitby <rod@whitby.id.au>
Sat, 25 Aug 2007 12:06:05 +0000 (12:06 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 25 Aug 2007 12:06:05 +0000 (12:06 +0000)
     and 'd6d91eeea2717dbb2f84f543b7cba45548ba6dbc'


Trivial merge