Add Debian 7.6.0 amd64 and i386
Fixing merge conflict