merge of '848c6e3f16104e7b87568edf06d0d9cc79b5e860'
authorRod Whitby <rod@whitby.id.au>
Tue, 25 Mar 2008 00:51:35 +0000 (00:51 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 25 Mar 2008 00:51:35 +0000 (00:51 +0000)
     and 'aff156eb3c821fe61a4b7788e1da432c621d1383'


Trivial merge