Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sun, 12 Feb 2012 19:22:32 +0000 (11:22 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sun, 12 Feb 2012 19:22:32 +0000 (11:22 -0800)
commit82be12267420daca4cc6e5f39555e0b18a9c1732
tree508d8ced4d5bcd37f89ca522271e2a9b16c69cba
parentdf9ea3742cca00817e8bd3621d3db533e838ad36
parentbf4591b39db818f234a24772af7baa6220fc0480
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2