merge of '1c7cc034e1bbb048ed219e7e44f7fc07d97cb8bf'
authorRod Whitby <rod@whitby.id.au>
Tue, 3 Apr 2007 20:07:09 +0000 (20:07 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 3 Apr 2007 20:07:09 +0000 (20:07 +0000)
     and '23ea6727fc6e79bd76e1f20612e1937b0dc8e45c'


Trivial merge