From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Tue, 11 Oct 2011 13:38:35 +0000 (+0800)
Subject: Merge branch 'devel'
X-Git-Tag: v3.0.0~870
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/10c9bcda5cb69da196c760cfc280c058a6eeb154

Merge branch 'devel'
---

10c9bcda5cb69da196c760cfc280c058a6eeb154