Merged bug fix from Stable into Unstable

This commit is contained in:
Mauricio Carneiro 2011-07-05 13:26:41 -04:00
commit 90f8de37d5

Diff Content Not Available