Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sun, 13 May 2012 00:43:02 +0000 (17:43 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sun, 13 May 2012 00:43:02 +0000 (17:43 -0700)

Trivial merge