merge of 'aa332b0757a7f250aec59dac51d57c4cdfda5e6e'
authorPaul Eggleton <bluelightning@bluelightning.org>
Thu, 9 Oct 2008 22:24:49 +0000 (22:24 +0000)
committerPaul Eggleton <bluelightning@bluelightning.org>
Thu, 9 Oct 2008 22:24:49 +0000 (22:24 +0000)
     and 'b74f88e907776bb75ebf406e06efc1fa0a2ea1c0'


Trivial merge