[rock-sm] 2006012311373209964 teha msg please rediff in unified form (no contex

[submaster@rocklinux.org]

Open Patch: 2006012311373209964 [by netrunner]               + netrunner
                                                             + stf
Andreas V. Meier:
         update hal(0.5.6)
         overwrite some broken predefines

(teha) please rediff in unified form (no context for .conf)

----------------------------------------------------------------------------
https://www.rocklinux.net/submaster/smadm.cgi?i=2006012311373209964