Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Mon, 27 Feb 2012 19:29:49 +0000 (11:29 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Mon, 27 Feb 2012 19:29:49 +0000 (11:29 -0800)

Trivial merge