Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Mon, 30 Apr 2012 22:51:32 +0000 (15:51 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Mon, 30 Apr 2012 22:51:32 +0000 (15:51 -0700)
commite06c72d35a57a1566874def502fed33173843483
tree32823932aaf583a251e856c454cfb7d21e7dca3d
parentf55c891db7c11e625cf79b48b3b9140e67d02e21
parent66030e2b4635359f2d84f23298c9d8ce1e6af5da
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2