From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Thu, 23 Feb 2012 16:59:32 +0000 (-0800)
Subject: Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository... 
X-Git-Tag: v3.4.0rc~1192
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/8a3b67bf3699b81b8893c0e7164bac89ac59930f

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

8a3b67bf3699b81b8893c0e7164bac89ac59930f