merge of '88676b03209e4a8147b6f9ab4d6f5c66d0132128'
authorPaul Eggleton <bluelightning@bluelightning.org>
Wed, 8 Oct 2008 19:07:08 +0000 (19:07 +0000)
committerPaul Eggleton <bluelightning@bluelightning.org>
Wed, 8 Oct 2008 19:07:08 +0000 (19:07 +0000)
     and 'bcae381ccf0226faafe756ae8699c9b1623bf951'


Trivial merge