Merged bug fix from Stable into Unstable

This commit is contained in:
Mauricio Carneiro 2011-12-12 11:00:47 -05:00
commit 3519a897c4

Diff Content Not Available