merging branches
fix issues with apt
Merge branch 'master-chef-11.10' of https://github.com/cru-Luis-Rodriguez/cru-cookbooks into master-chef-11.10

Conflicts:
	apt/CHANGELOG.md
	apt/README.md
	apt/files/default/apt-proxy-v2.conf
	apt/metadata.rb
	apt/providers/preference.rb
	apt/providers/repository.rb
	apt/recipes/cacher-client.rb
	apt/recipes/cacher-ng.rb
	apt/recipes/default.rb
	apt/resources/preference.rb
	apt/resources/repository.rb
	apt/templates/debian-6.0/acng.conf.erb
	apt/templates/default/01proxy.erb
	apt/templates/default/acng.conf.erb
	apt/templates/ubuntu-10.04/acng.conf.erb