Merged bug fix from Stable into Unstable

This commit is contained in:
Mauricio Carneiro 2011-06-30 01:17:32 -04:00
commit 7cfe9d1f94

Diff Content Not Available