Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 2 Jun 2012 17:38:41 +0000 (10:38 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 2 Jun 2012 17:38:41 +0000 (10:38 -0700)
commit986a2d88552082c4eaf7cf243fcb5cf9fde16ab3
tree1e52198066e50889b8b9294599d70551631287af
parentf03672ec8417e4da82df0f957e6faa27bd9af19d
parent2109c3ef2d1885c4441ce6f1fde2502a4db8cb1b
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2