Null-Merge commit 'a062604' into cg_merges_20130524b

Conflicts:
	Makefile.am
	NEWS
	api.c
	configure.ac
	driver-cpu.c
	miner.c
	miner.h
	sha256_4way.c
	sha256_altivec_4way.c
	sha256_cryptopp.c
	sha256_generic.c
	sha256_sse2_amd64.c
	sha256_sse2_i386.c
	sha256_sse4_amd64.c
	sha256_via.c
	x86_32/sha256_xmm.asm