Commit 4c8ac4f47e95d2b266b2f64e75c55af8233b6b91

Behdad Esfahbod 2012-08-08T17:44:19

Misc minor fixes