merge of 'a8f3f61cfe31f5cb506de603a9fe0b7ddacc316f'
authorPaul Eggleton <bluelightning@bluelightning.org>
Mon, 6 Oct 2008 19:18:06 +0000 (19:18 +0000)
committerPaul Eggleton <bluelightning@bluelightning.org>
Mon, 6 Oct 2008 19:18:06 +0000 (19:18 +0000)
     and 'ec2835e0caacbf9d2e48582fc02e6b933292fd65'


Trivial merge