<NME> .gitignore
<BEF> *.d
*.o
.*.swp
tcpcrypt

<MSG> Merge branch 'master' of git://github.com/sorbo/tcpcrypt

Conflicts:
	README.markdown
	user/contrib/.gitignore
	user/launch_tcpcryptd.sh
	user/lib/.gitignore

<DFF> @@ -2,3 +2,4 @@
 *.o
 .*.swp
 tcpcrypt
+Makefile

Merge branch 'master' of git://github.com/sorbo/tcpcrypt