magento-1.8.0.0
Merge branch 'magento-1.8.0.0'