Merge commit 'chlamydia/master'
authorThomas Nikolajsen <thomas@dragonflybsd.org>
Sun, 8 Feb 2009 15:17:47 +0000 (16:17 +0100)
committerThomas Nikolajsen <thomas@dragonflybsd.org>
Sun, 8 Feb 2009 15:17:47 +0000 (16:17 +0100)

Trivial merge