Merge branch 'master' into debian
authorEvan Broder <broder@mit.edu>
Mon, 28 Jun 2010 20:30:12 +0000 (16:30 -0400)
committerEvan Broder <broder@mit.edu>
Mon, 28 Jun 2010 20:30:12 +0000 (16:30 -0400)

Trivial merge