Merge branch 'master' of git://git.dragonflybsd.org/dragonfly
authorMatthias Schmidt <matthias@dragonflybsd.org>
Fri, 17 Sep 2010 10:04:36 +0000 (12:04 +0200)
committerMatthias Schmidt <matthias@dragonflybsd.org>
Fri, 17 Sep 2010 10:04:36 +0000 (12:04 +0200)
commit1e7b5ae2294f4ce1f99dc39c9fd3159c333dd46e
treec028df8e5010714d48aeb5c3ae0e70b474c7bc12
parent307f84e126ba0ec0db0bba51f046e882db36d245
parent5217bcbc2e93291d234b66b766c4801140f9d4f1
Merge branch 'master' of git://git.dragonflybsd.org/dragonfly