commit Mafer 201302041956
Merge branch 'master' of https://github.com/clsard/magento.git
commit Mafer 201302061732
Revert "commit Mafer 201302061732"

This reverts commit b9bab2c98b28d67fe025348baabe118bf4b44ced.
commit Mafer 201302061732