Merging CARP from RELENG_6 to RELENG_6_1
# Merging CARP only changes from RELENG_6 to RELENG_6_1
cd /usr/src_releng_6/src/sys && \
tar czvpf /tmp/net_RELENG_6.tgz --exclude CVS net netinet contrib/pf && \
cd /usr/src/sys && \
tar xzvpf /tmp/net_RELENG_6.tgz
patch < /home/pfsense/tools/patches/if_carp.lock.diff