merge of '816810f6dfc46f435b5ae83e81e9cb7eab296ef8'
authorRod Whitby <rod@whitby.id.au>
Sat, 7 Jul 2007 13:37:23 +0000 (13:37 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 7 Jul 2007 13:37:23 +0000 (13:37 +0000)
     and 'ef8fb5f70fe8b66d3102817eaaf153ad92cb0ebb'


Trivial merge