Commit 20c8b908ddf50a9814dfdd9fca595f258273cd4f

Behdad Esfahbod 2011-05-12T15:19:33

Finish off previous change