Merge git://git.dragonflybsd.org/dragonfly
authorVenkatesh Srinivas <me@endeavour.zapto.org>
Mon, 12 Dec 2011 01:21:35 +0000 (17:21 -0800)
committerVenkatesh Srinivas <me@endeavour.zapto.org>
Mon, 12 Dec 2011 01:21:35 +0000 (17:21 -0800)

Trivial merge