Merge remote branch 'drax/master'
authorCarl Worth <cworth@cworth.org>
Sun, 22 Nov 2009 23:43:26 +0000 (00:43 +0100)
committerCarl Worth <cworth@cworth.org>
Sun, 22 Nov 2009 23:43:26 +0000 (00:43 +0100)

Trivial merge