Merged bug fix from Stable into Unstable

This commit is contained in:
Mauricio Carneiro 2011-11-02 17:53:56 -04:00
commit c22a14ee3b

Diff Content Not Available