Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorVenkatesh Srinivas <me@rem.(none)>
Tue, 11 Jan 2011 04:19:28 +0000 (23:19 -0500)
committerVenkatesh Srinivas <me@rem.(none)>
Tue, 11 Jan 2011 04:19:28 +0000 (23:19 -0500)

Trivial merge