merge of '0de79e77116c042b92a36942f9817043f9ee16d1'
authorRod Whitby <rod@whitby.id.au>
Wed, 19 Sep 2007 21:30:50 +0000 (21:30 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 19 Sep 2007 21:30:50 +0000 (21:30 +0000)
     and 'a8f3bafcb48eddb52c9b4c0eae2518264f20ea14'


Trivial merge