Merge branch 'master' into my-XACE-modular

Conflicts:

	configure.ac
This commit is contained in:
Eamon Walsh
2006-09-05 18:03:25 -04:00
committed by Eamon Walsh
68 changed files with 5692 additions and 11129 deletions

View File

@@ -222,6 +222,9 @@
/* Support IPv6 for TCP connections */
#undef IPv6
/* Support os-specific local connections */
#undef LOCALCONN
/* Support MIT Misc extension */
#undef MITMISC