Commit 80af2812fb3b231ddcb4608ec13c6038a681c818

Behdad Esfahbod 2010-05-24T18:14:24

Merge remote branch 'martin/master'