Merged revisions 1806-1811,1816 from stable.

tbrehm

2010-06-09 a59ad3ae1bd0b9bf773120074113f4a9cf19864f

 server/conf/bind_pri.domain.master

@@ -39,7 +39,7 @@
{tmpl_var name='name'}      RP        {tmpl_var name='data'}
</tmpl_if>
<tmpl_if name="type" op='==' value='SRV'>
{tmpl_var name='name'}      SRV        {tmpl_var name='data'}
{tmpl_var name='name'}      SRV        0 {tmpl_var name='data'}
</tmpl_if>
<tmpl_if name="type" op='==' value='TXT'>
{tmpl_var name='name'}      TXT        {tmpl_var name='data'}