Merge branch 'master' of /repository/git/dragonfly
authorVenkatesh Srinivas <me@endeavour.zapto.org>
Sat, 24 Dec 2011 00:32:56 +0000 (16:32 -0800)
committerVenkatesh Srinivas <me@endeavour.zapto.org>
Sat, 24 Dec 2011 00:32:56 +0000 (16:32 -0800)

Trivial merge