Merge branch 'master' of /repository/git/dragonfly
authorVenkatesh Srinivas <me@endeavour.zapto.org>
Wed, 16 Feb 2011 01:20:10 +0000 (17:20 -0800)
committerVenkatesh Srinivas <me@endeavour.zapto.org>
Wed, 16 Feb 2011 01:20:10 +0000 (17:20 -0800)

Trivial merge