Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --cc config/rootfiles/core/37/filelists/files
index 5ef91c8ab42415cce6a6dedbf7ee711ff0b2161a,1e46cb98f779504d0865b7c2c077e1dbd7567b7c..024bd72160f4ce5d95fb697630f5fe55c876ca97
--- 1/config/rootfiles/core/37/filelists/files
--- 2/config/rootfiles/core/37/filelists/files
+++ b/config/rootfiles/core/37/filelists/files
@@@ -3,5 -3,8 +3,9 @@@ lib/modules/2.6.27.42-ipfire/kernel/ne
  lib/modules/2.6.27.42-ipfire-xen/kernel/net
  lib/modules/2.6.27.42-ipfire/mISDN/hfcsusb.ko
  lib/modules/2.6.27.42-ipfire-xen/mISDN/hfcsusb.ko
+ lib/modules/2.6.27.42-ipfire/kernel/drivers/hwmon/coretemp.ko
+ lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/hwmon/coretemp.ko
+ lib/modules/2.6.27.42-ipfire/kernel/drivers/net/et131x.ko
+ lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/net/et131x.ko
  srv/web/ipfire/cgi-bin/urlfilter.cgi
 +srv/web/ipfire/cgi-bin/outgoingfw.cgi