merge of '4dbd9e3e7dca8c8ff286cb769fda19743f9302aa'
authorPaul Eggleton <bluelightning@bluelightning.org>
Sat, 7 Jun 2008 17:16:49 +0000 (17:16 +0000)
committerPaul Eggleton <bluelightning@bluelightning.org>
Sat, 7 Jun 2008 17:16:49 +0000 (17:16 +0000)
     and '56a6277181644bc049b217d5f4aff4c34d907ba1'


Trivial merge