merge of '0e6176690cfdc4e760baed9754ed33c972437f83'
authorPaul Eggleton <bluelightning@bluelightning.org>
Sun, 5 Oct 2008 00:57:38 +0000 (00:57 +0000)
committerPaul Eggleton <bluelightning@bluelightning.org>
Sun, 5 Oct 2008 00:57:38 +0000 (00:57 +0000)
     and '34c94b40cf0e6a6fe0c504ae02571dbb2770c9ee'


Trivial merge