merge of '15e084fa8118e1a49559b4193f626d0c5ad7cce0'
authorRod Whitby <rod@whitby.id.au>
Sun, 1 Apr 2007 21:59:44 +0000 (21:59 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 1 Apr 2007 21:59:44 +0000 (21:59 +0000)
     and '80791bbfbbfd682c0e16ebb739bfb7041451a1c1'


Trivial merge