Merge pull request #1046 from marcosgdf/develop

CR fix
This commit is contained in:
Laurent Destailleur 2013-06-15 12:54:32 -07:00
commit 6781d43265
2 changed files with 44 additions and 44 deletions