debian 6.0.5 is no longer available, change to 6.0.7
Merge branch 'BENTO-31' of git://github.com/ctdk/bento into ctdk-BENTO-31

Conflicts:
	definitions/debian-6.0.7-i386/chef-client.sh
	definitions/debian-6.0.7/chef-client.sh