Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Tue, 14 Feb 2012 05:11:51 +0000 (21:11 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Tue, 14 Feb 2012 05:11:51 +0000 (21:11 -0800)
commita56fb0785c095bf848d5fb480a93677f85b56733
treeda8a5d20d8dc2b2cacc4fa6a0630f14366300649
parentb7926f310b7b7a02b46070c92b13540dd2c482e3
parenta3decb84b257a764fe87b34385a3f1b8ce4968f7
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2