Merge commit 'chlamydia/master'
authorThomas Nikolajsen <thomas@dragonflybsd.org>
Tue, 7 Apr 2009 21:15:00 +0000 (23:15 +0200)
committerThomas Nikolajsen <thomas@dragonflybsd.org>
Tue, 7 Apr 2009 21:15:00 +0000 (23:15 +0200)

Trivial merge