Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly
authorMatthias Schmidt <matthias@dragonflybsd.org>
Tue, 30 Dec 2008 22:06:48 +0000 (23:06 +0100)
committerMatthias Schmidt <matthias@dragonflybsd.org>
Tue, 30 Dec 2008 22:06:48 +0000 (23:06 +0100)
commit4173863d7f757b165b4628a7747eca455655396f
tree430ccabf0eb610d7cc6ed1a535f8945fda2f43ef
parentf01d2d57a8c2f21eda927891d93a588bd2cb8cad
parent99fe2010dfe70b7c352dfdad118e2776a53819c5
Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly