Commit f22089ac24f43ff048c2a0f1c1f604ae3a96be8b

Behdad Esfahbod 2012-01-20T21:21:47

Misc fixes