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)
commitfa005edde179b65c5fed2509614e749daf07291d
tree12b090c0d36725be44a68f249f5bd99eb5e59535
parent0656dd4c11374b2a0cb3fced18def0e052c8a110
parenta6df19a9a7777273b8f0b4cd7a6b59b8e5cc72ba
Merge commit 'chlamydia/master'