Merge:
authorTim Potter <tpot@samba.org>
Mon, 14 Apr 2003 04:05:48 +0000 (04:05 +0000)
committerTim Potter <tpot@samba.org>
Mon, 14 Apr 2003 04:05:48 +0000 (04:05 +0000)
commitb5b6f11940c91dc5ecb5f4a4320e7b9aa72bcd99
treeb39df6b4544f5826bb4efc6126881838d0c5e3c7
parentba53df64cab5dc0ea9f2b7d82007bf655f85bc67
Merge:

- Jelmer's popt changes
source/Makefile.in
source/client/client.c