From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Mon, 24 Oct 2011 12:10:07 +0000 (+0800)
Subject: Merge branch 'devel'
X-Git-Tag: v3.0.0~833
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/ead125b874628dc824f4c2b1a3b12c4520fae137

Merge branch 'devel'
---

ead125b874628dc824f4c2b1a3b12c4520fae137