Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorVenkatesh Srinivas <me@endeavour.zapto.org>
Sun, 6 Mar 2011 13:20:31 +0000 (05:20 -0800)
committerVenkatesh Srinivas <me@endeavour.zapto.org>
Sun, 6 Mar 2011 13:20:31 +0000 (05:20 -0800)

Trivial merge