Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 12 May 2012 01:16:49 +0000 (18:16 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 12 May 2012 01:16:49 +0000 (18:16 -0700)
commite864c670ade516c6a877dcae8ff7d67bd6556ba9
treeb63017a6ec536b02a24f4155a36ef48c2556482f
parentec70266467411565ead9166ad4c1dbb79ff7cd77
parentee39cac471924701bfeab3ae2346eb967b9d56bf
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2