pginstaller - pginst: Move pgAdmin into main installer and out of merge

Log Message:
-----------
Move pgAdmin into main installer and out of merge module to gain useful control over shortcuts etc.

Modified Files:
--------------
pginst:
Makefile (r1.6 -> r1.7)
(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pginstaller/pginst/Makefile.diff?r1=1.6&r2=1.7)
Makefile.config (r1.5 -> r1.6)
(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pginstaller/pginst/Makefile.config.diff?r1=1.5&r2=1.6)
pginst/wxs:
pginst.wxs (r1.24 -> r1.25)
(http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pginstaller/pginst/wxs/pginst.wxs.diff?r1=1.24&r2=1.25)