Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorVenkatesh Srinivas <me@endeavour.zapto.org>
Tue, 31 Jan 2012 05:18:17 +0000 (00:18 -0500)
committerVenkatesh Srinivas <me@endeavour.zapto.org>
Tue, 31 Jan 2012 05:18:17 +0000 (00:18 -0500)

Trivial merge