Merge branch 'master' of /repository/git/dragonfly
authorVenkatesh Srinivas <me@endeavour.zapto.org>
Thu, 26 Aug 2010 01:40:01 +0000 (18:40 -0700)
committerVenkatesh Srinivas <me@endeavour.zapto.org>
Thu, 26 Aug 2010 01:40:01 +0000 (18:40 -0700)

Trivial merge