merge of '9ed842c8829018871f79ce96e77189742d9b7c6b'
authorPaul Eggleton <bluelightning@bluelightning.org>
Mon, 22 Sep 2008 23:45:44 +0000 (23:45 +0000)
committerPaul Eggleton <bluelightning@bluelightning.org>
Mon, 22 Sep 2008 23:45:44 +0000 (23:45 +0000)
     and 'ba6a6901de641366d142b6f40df71611efb5ff81'


Trivial merge