merge of '3da5174282c3cc65d9982b13c8d2c63c267fddb0'
authorRod Whitby <rod@whitby.id.au>
Thu, 15 Feb 2007 04:40:07 +0000 (04:40 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 15 Feb 2007 04:40:07 +0000 (04:40 +0000)
     and '3e3164bc6ee6bcdbe9edc5dd9cd872fbc441cb37'


Trivial merge