- Merge upstream changes

- Add Xavier Toth patches
This commit is contained in:
Daniel J Walsh 2008-09-17 23:56:23 +00:00
parent 0abbc2d405
commit b844bb281b
2 changed files with 779 additions and 773 deletions

View File

@ -253,7 +253,7 @@ cpucontrol = base
# #
# Periodic execution of scheduled commands. # Periodic execution of scheduled commands.
# #
cron = module cron = base
# Layer: services # Layer: services
# Module: cups # Module: cups
@ -793,7 +793,6 @@ mrtg = module
# #
mta = base mta = base
# Layer: services # Layer: services
# Module: mysql # Module: mysql
# #

File diff suppressed because it is too large Load Diff