Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorJustin C. Sherrill <justin@leaf.dragonflybsd.org>
Mon, 7 Feb 2011 00:44:26 +0000 (16:44 -0800)
committerJustin C. Sherrill <justin@leaf.dragonflybsd.org>
Mon, 7 Feb 2011 00:44:26 +0000 (16:44 -0800)
commit2443e96e1a16e9bd0cf271204f9d3725aebd54c3
treed985ce7bd51cc34fc806bbec9fd9554ad2206161
parenta4a39c9436a26e406c49f0c22c68ab6ba97caad6
parent869cbeea2d00972929deff2f93c462b5129a9936
Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly

Conflicts:
UPDATING
Makefile_upgrade.inc
UPDATING