merge of '2164eb62b60f233738ed0300039cc4c534e16a14'
authorPaul Eggleton <bluelightning@bluelightning.org>
Sun, 21 Sep 2008 13:56:33 +0000 (13:56 +0000)
committerPaul Eggleton <bluelightning@bluelightning.org>
Sun, 21 Sep 2008 13:56:33 +0000 (13:56 +0000)
     and 'e330aca99df7101ab377267e761f56c0df7ef4ae'


Trivial merge