Magento 1.5.1.0 updates.
Magento 1.5.1.0 additions.
README
Magento 1.6.0.0 en_US locale
Magento 1.6.0.0 en_US locale new file
ignores
Magento 1.7.0.0 original en_US translations.
Merge remote-tracking branch 'origin/en_US-1.6' into id_ID-1.6

Conflicts:
	README.md
	app/locale/id_ID/Find_Feed.csv
	app/locale/id_ID/Mage_Adminhtml.csv
	app/locale/id_ID/Mage_Api.csv
	app/locale/id_ID/Mage_Authorizenet.csv
	app/locale/id_ID/Mage_Bundle.csv
	app/locale/id_ID/Mage_Catalog.csv
	app/locale/id_ID/Mage_CatalogInventory.csv
	app/locale/id_ID/Mage_CatalogRule.csv
	app/locale/id_ID/Mage_CatalogSearch.csv
	app/locale/id_ID/Mage_Checkout.csv
	app/locale/id_ID/Mage_Cms.csv
	app/locale/id_ID/Mage_Connect.csv
	app/locale/id_ID/Mage_Core.csv
	app/locale/id_ID/Mage_Customer.csv
	app/locale/id_ID/Mage_Dataflow.csv
	app/locale/id_ID/Mage_Directory.csv
	app/locale/id_ID/Mage_Downloadable.csv
	app/locale/id_ID/Mage_Eav.csv
	app/locale/id_ID/Mage_GiftMessage.csv
	app/locale/id_ID/Mage_GoogleBase.csv
	app/locale/id_ID/Mage_GoogleCheckout.csv
	app/locale/id_ID/Mage_ImportExport.csv
	app/locale/id_ID/Mage_Install.csv
	app/locale/id_ID/Mage_Newsletter.csv
	app/locale/id_ID/Mage_Page.csv
	app/locale/id_ID/Mage_PageCache.csv
	app/locale/id_ID/Mage_Paygate.csv
	app/locale/id_ID/Mage_Payment.csv
	app/locale/id_ID/Mage_Paypal.csv
	app/locale/id_ID/Mage_PaypalUk.csv
	app/locale/id_ID/Mage_Persistent.csv
	app/locale/id_ID/Mage_Reports.csv
	app/locale/id_ID/Mage_Review.csv
	app/locale/id_ID/Mage_Rss.csv
	app/locale/id_ID/Mage_Sales.csv
	app/locale/id_ID/Mage_SalesRule.csv
	app/locale/id_ID/Mage_Shipping.csv
	app/locale/id_ID/Mage_Tag.csv
	app/locale/id_ID/Mage_Tax.csv
	app/locale/id_ID/Mage_Usa.csv
	app/locale/id_ID/Mage_Wishlist.csv
	app/locale/id_ID/Mage_XmlConnect.csv
	app/locale/id_ID/Phoenix_Moneybookers.csv
	app/locale/id_ID/template/email/account_new.html
	app/locale/id_ID/template/email/account_new_confirmation.html
	app/locale/id_ID/template/email/account_new_confirmed.html
	app/locale/id_ID/template/email/admin_password_new.html
	app/locale/id_ID/template/email/newsletter_subscr_confirm.html
	app/locale/id_ID/template/email/password_new.html
	app/locale/id_ID/template/email/sales/creditmemo_new.html
	app/locale/id_ID/template/email/sales/creditmemo_new_guest.html
	app/locale/id_ID/template/email/sales/creditmemo_update.html
	app/locale/id_ID/template/email/sales/creditmemo_update_guest.html
	app/locale/id_ID/template/email/sales/invoice_new.html
	app/locale/id_ID/template/email/sales/invoice_new_guest.html
	app/locale/id_ID/template/email/sales/invoice_update.html
	app/locale/id_ID/template/email/sales/invoice_update_guest.html
	app/locale/id_ID/template/email/sales/order_new.html
	app/locale/id_ID/template/email/sales/order_new_guest.html
	app/locale/id_ID/template/email/sales/order_update.html
	app/locale/id_ID/template/email/sales/order_update_guest.html
	app/locale/id_ID/template/email/sales/shipment_new.html
	app/locale/id_ID/template/email/sales/shipment_new_guest.html
	app/locale/id_ID/template/email/sales/shipment_update.html
	app/locale/id_ID/template/email/sales/shipment_update_guest.html
	app/locale/id_ID/template/email/wishlist_share.html
Merge branch 'id_ID-1.6' into id_ID-1.7
Merge remote-tracking branch 'origin/en_US-1.7' into id_ID-1.7

Conflicts:
	.gitignore
	app/design/frontend/default/default/locale/id_ID/translate.csv
	app/locale/id_ID/Find_Feed.csv
	app/locale/id_ID/Mage_AdminNotification.csv
	app/locale/id_ID/Mage_Adminhtml.csv
	app/locale/id_ID/Mage_Api.csv
	app/locale/id_ID/Mage_Backup.csv
	app/locale/id_ID/Mage_Catalog.csv
	app/locale/id_ID/Mage_CatalogInventory.csv
	app/locale/id_ID/Mage_CatalogRule.csv
	app/locale/id_ID/Mage_CatalogSearch.csv
	app/locale/id_ID/Mage_Centinel.csv
	app/locale/id_ID/Mage_Checkout.csv
	app/locale/id_ID/Mage_Core.csv
	app/locale/id_ID/Mage_Customer.csv
	app/locale/id_ID/Mage_Dataflow.csv
	app/locale/id_ID/Mage_Directory.csv
	app/locale/id_ID/Mage_Downloadable.csv
	app/locale/id_ID/Mage_Eav.csv
	app/locale/id_ID/Mage_GoogleBase.csv
	app/locale/id_ID/Mage_GoogleCheckout.csv
	app/locale/id_ID/Mage_GoogleOptimizer.csv
	app/locale/id_ID/Mage_Index.csv
	app/locale/id_ID/Mage_Install.csv
	app/locale/id_ID/Mage_Page.csv
	app/locale/id_ID/Mage_Paygate.csv
	app/locale/id_ID/Mage_Payment.csv
	app/locale/id_ID/Mage_Paypal.csv
	app/locale/id_ID/Mage_PaypalUk.csv
	app/locale/id_ID/Mage_Persistent.csv
	app/locale/id_ID/Mage_Rating.csv
	app/locale/id_ID/Mage_Reports.csv
	app/locale/id_ID/Mage_Review.csv
	app/locale/id_ID/Mage_Rss.csv
	app/locale/id_ID/Mage_Rule.csv
	app/locale/id_ID/Mage_Sales.csv
	app/locale/id_ID/Mage_SalesRule.csv
	app/locale/id_ID/Mage_Shipping.csv
	app/locale/id_ID/Mage_Tag.csv
	app/locale/id_ID/Mage_Tax.csv
	app/locale/id_ID/Mage_Usa.csv
	app/locale/id_ID/Mage_Widget.csv
	app/locale/id_ID/Mage_Wishlist.csv
	app/locale/id_ID/Mage_XmlConnect.csv