merge of '1b0fc9ca528c44a3ebfa45c437a36c340e15357d'
authorRod Whitby <rod@whitby.id.au>
Mon, 19 Feb 2007 16:05:28 +0000 (16:05 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 19 Feb 2007 16:05:28 +0000 (16:05 +0000)
     and '6b385aa937756d61423605d5e3e62a25f90cbcd9'


Trivial merge