[svn r7430] -- added configurations merging for macro.conf.php
[svn r7430] -- added configurations merging for macro.conf.php

--HG--
branch : trunk

AlexMarlo/limb,limb-php-framework/limb-cms,anoam/limb,limb-php-framework/limb,limb-php-framework/limb-cms,anoam/limb,anoam/limb,anoam/limb,anoam/limb,anoam/limb,AlexMarlo/limb,limb-php-framework/limb,AlexMarlo/limb,limb-php-framework/limb,limb-php-framework/limb,limb-php-framework/limb