Beefed up Qt detection.  Builds under OSX against Qt package or
MacPorts install.
Merge remote-tracking branch 'origin/master'

Conflicts:
	configure.ac