Merge commit 'chlamydia/master'
authorThomas Nikolajsen <thomas@dragonflybsd.org>
Mon, 6 Apr 2009 21:52:47 +0000 (23:52 +0200)
committerThomas Nikolajsen <thomas@dragonflybsd.org>
Mon, 6 Apr 2009 21:52:47 +0000 (23:52 +0200)
commitd8c248c355f36e2f416526935bc105325baeaeee
treeb8517d2c8752cdb8e867a3e0cce20a973fb93701
parentc65d676ddae2782e450f6bde74b69b71192ab0c3
parentaedcd57b6e233218325c782277c874537ae73fda
Merge commit 'chlamydia/master'