Merge branch 'master' of /repository/git/dragonfly
authorVenkatesh Srinivas <me@endeavour.zapto.org>
Wed, 12 Jan 2011 20:09:37 +0000 (12:09 -0800)
committerVenkatesh Srinivas <me@endeavour.zapto.org>
Wed, 12 Jan 2011 20:09:37 +0000 (12:09 -0800)

Trivial merge