Merge branches

diff --cc Makefile
index 01cc9adebf96e99e5de998076caa4420414cf793,01cc9adebf96e99e5de998076caa4420414cf793..d1f2e95a91e5e70d77a2190832a025d92c3e756e
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -29,7 -29,7 +29,7 @@@ install: nmrpflas
        install -m 755 nmrpflash $(PREFIX)/bin
  
  release/osx:
--      CFLAGS="-arch i686 -arch x86_64 -mmacosx-version-min=10.6" make release
++      CFLAGS="-arch i386 -arch x86_64 -mmacosx-version-min=10.6" make release
        zip nmrpflash-osx.zip nmrpflash
  
  release/linux: release

diff --cc ethsock.c
Simple merge

diff --cc nmrp.c
index c696fccaebb22a07fa4acd3c934f9b93ec66243b,59938db152607e4882100f96d8800dcc2c772ff3..39d37f96d7dbe13aadad741f1f83adbd69da0ebb
--- 1/nmrp.c
--- 2/nmrp.c
+++ b/nmrp.c
@@@ -393,9 -462,7 +462,7 @@@ int nmrp_do(struct nmrpd_args *args
                return 1;
        }
  
-       sigh_orig = signal(SIGINT, sigh);
- 
 -      status = is_valid_ip(sock, &ipconf.addr, &ipconf.mask);
 +      status = is_valid_ip(sock, &ipaddr, &ipmask);
        if (status <= 0) {
                if (!status) {
                        fprintf(stderr, "Address %s/%s cannot be used on interface %s.\n",