merge of '1c7464901fc8ab3cb0e3ade6fdf445011603f0c4'
authorRod Whitby <rod@whitby.id.au>
Thu, 15 Feb 2007 06:21:02 +0000 (06:21 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 15 Feb 2007 06:21:02 +0000 (06:21 +0000)
     and '5696d93cf7ba3449e090b00b16a4acc06e5377f6'


Trivial merge