core -> community
Merge branch 'master' of github.com:magento-hackathon/Shipping-rates-grid-in-Magento