From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Mon, 30 Apr 2012 22:51:32 +0000 (-0700)
Subject: Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository... 
X-Git-Tag: v3.4.0rc~1128
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/e06c72d35a57a1566874def502fed33173843483

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

e06c72d35a57a1566874def502fed33173843483