Merge branch 'master' of /repository/git/dragonfly
authorVenkatesh Srinivas <me@endeavour.zapto.org>
Thu, 16 Sep 2010 17:10:28 +0000 (10:10 -0700)
committerVenkatesh Srinivas <me@endeavour.zapto.org>
Thu, 16 Sep 2010 17:10:28 +0000 (10:10 -0700)

Trivial merge