Merged bug fix from Stable into Unstable

Merge branch 'master' into unstable
This commit is contained in:
Guillermo del Angel 2011-07-07 15:41:01 -04:00
commit 231e4bdb11

Diff Content Not Available