Commit 928b7d4960e609e312180b93952c09449bf2d8e3

Nick Mathewson 2010-07-16T12:38:23

Merge branch 'pncalls_fix'