From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Thu, 16 Aug 2012 17:09:04 +0000 (-0700)
Subject: Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository... 
X-Git-Tag: v3.4.0rc~1012
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/12887237462cab0553f0c77b9be5bd6869732857

Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2
---

12887237462cab0553f0c77b9be5bd6869732857