Merge from vendor branch TNF:
authorabs <abs>
Wed, 23 Nov 2011 23:09:35 +0000 (23:09 +0000)
committerabs <abs>
Wed, 23 Nov 2011 23:09:35 +0000 (23:09 +0000)
commitb4c84bafe54aafaa450cca5a4fea0b8b559ffc0a
tree2bfcdd8c0c843fb1418b0093f495eadbc01fe6af
parente85e8ff10a2ff4c2709020714318f71b92e520e3
parent0a655a82b01e852a8010af7e1a875a73c49e15b1
Merge from vendor branch TNF:
Reimport net/skype as net/skype1 to make it clear it is a very old version

Also while here fix a nasty issue with installing a Linux binary with
INSTALL_PROGRAM, and misc pkglint.