Update changelog & VERSION for 2.6.0~pre4
Fix crash on debian wheezy + gcc4.7.2
Merge branch '2.6'

Conflicts:
	VERSION