- Merge upstream changes

- Add Xavier Toth patches
2008-09-17 23:56:23 +00:00 · 2008-09-17 23:56:23 +00:00 · b844bb281b
commit b844bb281b
parent 0abbc2d405
2 changed files with 779 additions and 773 deletions
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@ -253,7 +253,7 @@ cpucontrol = base
 #
 # Periodic execution of scheduled commands.
 # 
-cron = module 
+cron = base

 # Layer: services
 # Module: cups
@ -793,7 +793,6 @@ mrtg = module
 # 
 mta = base

-
 # Layer: services
 # Module: mysql
 #
--- a/policy-20080710.patch
+++ b/policy-20080710.patch