merge of '0af36442f2b5ad5f505d802f19a109562afaee66'
authorPaul Eggleton <bluelightning@bluelightning.org>
Sat, 2 Aug 2008 20:17:59 +0000 (20:17 +0000)
committerPaul Eggleton <bluelightning@bluelightning.org>
Sat, 2 Aug 2008 20:17:59 +0000 (20:17 +0000)
     and '0dee125d6c77c5911cd60676bb87681b7565e13f'


Trivial merge