Merge pull request #1054 from marcosgdf/develop

CR fix
This commit is contained in:
Laurent Destailleur 2013-06-16 15:05:28 -07:00
commit 7ec8220826
4 changed files with 293 additions and 293 deletions