Merge branch 'master' of ssh://repo.or.cz/srv/git/cl-devil
authorJulian Squires <julian@cipht.net>
Wed, 13 May 2009 21:44:05 +0000 (13 17:44 -0400)
committerJulian Squires <julian@cipht.net>
Wed, 13 May 2009 21:44:05 +0000 (13 17:44 -0400)

Trivial merge