More revert conflicts

This commit is contained in:
Tom Eastep
2009-07-06 18:23:23 -07:00
parent bab4f9df33
commit f88048ebe4
10 changed files with 65 additions and 24 deletions

View File

@ -139,6 +139,8 @@ DELAYBLACKLISTLOAD=No
MODULE_SUFFIX=
DISABLE_IPV6=Yes
BRIDGING=No
DYNAMIC_ZONES=No