Commit 9ca7a3a3d6be5741095b3ba2c7e1c979f66628cb

Nick Mathewson 2008-05-30T16:19:01

Resolve two conflicts. svn:r839