Merged revisions 2173-2174 from stable branch.

tbrehm

2011-01-12 03bca94981b46d3b7e1251d11a91f7aeaef2143e

 interface/web/admin/templates/server_config_server_edit.htm

@@ -8,7 +8,7 @@
      <div class="ctrlHolder">
            <p class="label">{tmpl_var name='auto_network_configuration_txt'}</p>
               <div class="multiField">
                  {tmpl_var name='auto_network_configuration'}
                  {tmpl_var name='auto_network_configuration'} {tmpl_var name='network_config_warning_txt'}
               </div>
         </div>
      <div class="ctrlHolder">