merge of '30fd35ee6ce559cd4ecf5885980ec31563708c87'
authorRod Whitby <rod@whitby.id.au>
Sat, 14 Apr 2007 23:56:48 +0000 (23:56 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 14 Apr 2007 23:56:48 +0000 (23:56 +0000)
     and 'c0c6fbf1b52e5b3dc94b1e33e9622d2431debebd'


Trivial merge