Commit 15c7379c16dbb9ee8ed1c0333ca7492532ce8423

Behdad Esfahbod 2010-05-26T10:48:10

Revert "Merge remote branch 'martin/master'" This reverts commit 80af2812fb3b231ddcb4608ec13c6038a681c818, reversing changes made to c442672ec2fb83ed41f3994b3aa4f92a097664ab.