Merge branch 'dev' of ssh://raid.local.hde.co.jp/hde/karesansui/karesansui into dev

Conflicts:
	karesansui/templates/default/hostby1watch/hostby1watch.input

diff --cc karesansui/templates/default/hostby1watch/hostby1watch.input
index 04a8fec,39941f9..6b1af32
--- 1/karesansui/templates/default/hostby1watch/hostby1watch.input
--- 2/karesansui/templates/default/hostby1watch/hostby1watch.input
+++ b/karesansui/templates/default/hostby1watch/hostby1watch.input
@@@ -275,20 -294,8 +294,20 @@@ $(document).ready(function()
          "${_('Watch Name')}",
          "${_('Name of a new watch to add.')}");
  
-     $("#watch_target").change();
 +    helptip("#notification_mail_body_warning_help",
 +        "${_('Notification Mail Body')}",
 +        "${_('Allow to use some macro. Available macros are:')}");
 +
 +    helptip("#notification_mail_body_failure_help",
 +        "${_('Notification Mail Body')}",
 +        "${_('Allow to use some macro. Available macros are:')}");
 +
 +    helptip("#notification_mail_body_okay_help",
 +        "${_('Notification Mail Body')}",
 +        "${_('Allow to use some macro. Available macros are:')}");
 +
      $("#libvirt_target").change();
+     $("#watch_target").change();
  
      $("#threshold-accordion").accordion({
          header: ".accordion-header",