From: Venkatesh Srinivas <me@endeavour.zapto.org>
Date: Thu, 1 Dec 2011 19:12:30 +0000 (-0800)
Subject: Merge branch 'master' of /repository/git/dragonfly
X-Git-Tag: v3.0.0~517^2
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/40cb3ccd570d0d300f629b0300debe0264c61182

Merge branch 'master' of /repository/git/dragonfly
---

40cb3ccd570d0d300f629b0300debe0264c61182