Characterization of domains admitting strategy-proof and non-dictatorial social choice functions: A reappraisal (Discussion paper no. 2007-1, CEPET - Central European Program in Economic Theory, Institute of Public Economics, Graz University)