First Magento 1.7.0.2 checkin
Merge remote-tracking branch 'origin/master'