Merge branch 'work'
authorJan Schmidt <thaytan@noraisin.net>
Fri, 27 Feb 2009 12:03:23 +0000 (12:03 +0000)
committerJan Schmidt <thaytan@noraisin.net>
Fri, 27 Feb 2009 12:03:23 +0000 (12:03 +0000)

Trivial merge