merge of '434c4a5a7f3ee7f462db798e27cc0f7c2fd7458f'
authorPaul Eggleton <bluelightning@bluelightning.org>
Tue, 7 Oct 2008 22:07:07 +0000 (22:07 +0000)
committerPaul Eggleton <bluelightning@bluelightning.org>
Tue, 7 Oct 2008 22:07:07 +0000 (22:07 +0000)
     and 'aa5ca25b387398015df6ff4983a31df9f74a3dff'


Trivial merge