Commit e8a903cee8b3bfc56423a58ba313ee1a030ae6f1

Nick Mathewson 2010-10-27T10:27:04

Merge remote branch 'trondn/master'