Pull from trunk

This commit is contained in:
Kovid Goyal 2010-05-16 09:24:05 -06:00
commit 2e03dcaf6d