Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Tue, 28 Feb 2012 23:38:38 +0000 (15:38 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Tue, 28 Feb 2012 23:38:38 +0000 (15:38 -0800)
commit09a1fb76d16ffee025b3f6b21ad4467e8444a8cc
treecc95bf7b0388aac9cf0a02b9ea2c91aec5c49ea7
parentd5151ea96179c8087fc4763afca2753888a0a003
parentf36c8b06188cc623295c960acecc17686486c9ea
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2