Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 23 Mar 2012 20:40:36 +0000 (13:40 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 23 Mar 2012 20:40:36 +0000 (13:40 -0700)

Trivial merge