merge of '4d43ab58fc4f4986ece87cba9814bd2c1a63434d'
authorRod Whitby <rod@whitby.id.au>
Sun, 6 Apr 2008 10:21:21 +0000 (10:21 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 6 Apr 2008 10:21:21 +0000 (10:21 +0000)
     and 'bcc47d35b4f4f02379b2ed9b7110078ab656814a'


Trivial merge