Merged bug fix from Stable into Unstable

Merge branch 'master' into unstable
This commit is contained in:
Guillermo del Angel 2011-07-07 15:27:35 -04:00
commit d344317f8b

Diff Content Not Available