From: Thomas Nikolajsen <thomas@dragonflybsd.org>
Date: Sun, 8 Feb 2009 15:17:47 +0000 (+0100)
Subject: Merge commit 'chlamydia/master'
X-Git-Tag: v2.2.0~10^2~4
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/fa005edde179b65c5fed2509614e749daf07291d

Merge commit 'chlamydia/master'
---

fa005edde179b65c5fed2509614e749daf07291d