Conflicts:
	library/Solarium/Client.php
	library/Solarium/Core/Client/Adapter/ZendHttp.php
	library/Solarium/Core/Client/Request.php