Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Wed, 8 Aug 2012 22:04:02 +0000 (15:04 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Wed, 8 Aug 2012 22:04:02 +0000 (15:04 -0700)
commit7964589c7e952ba46306b0f76e36140124d946a4
treeb05cb090721bff16fe482af4914ed9892239822a
parentcb134596e1626f361411b5da3a6a5f113c471648
parentfecfcc569a652a96437e9330d182f61f4e406a41
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2