Magnetic properties of Mn-doped ZnO powder and thin films