merge of '987c8d92ee736e8162fb230be7d61936f9640e8d'
authorPaul Eggleton <bluelightning@bluelightning.org>
Sat, 2 Aug 2008 20:17:43 +0000 (20:17 +0000)
committerPaul Eggleton <bluelightning@bluelightning.org>
Sat, 2 Aug 2008 20:17:43 +0000 (20:17 +0000)
     and 'ccb7f1f9255a881fe31045e96a80be35d59827a8'


Trivial merge