Magnetic properties of the frustrated antiferromagnetic spinel ZnCr 2 O 4 and the spin-glass