Merged bug fix from Stable into Unstable

This commit is contained in:
Khalid Shakir 2012-03-19 14:37:36 -04:00
commit e8b083ac20

Diff Content Not Available