merge of '2db4e9cef88c3ec05f6df40ed5af176f05ff53f2'
authorRod Whitby <rod@whitby.id.au>
Sun, 10 Feb 2008 06:21:05 +0000 (06:21 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 10 Feb 2008 06:21:05 +0000 (06:21 +0000)
     and 'ff65599591bcdfa3d446b1ea051a1d78970b2a0e'


Trivial merge