Merge remote branch 'mainline/master'

Conflicts:
	usr/local/www/diag_smart.php
	usr/local/www/firewall_rules_edit.php
	usr/local/www/interfaces.php
	usr/local/www/load_balancer_pool_edit.php
	usr/local/www/pkg_mgr_settings.php

1 files changed, 1 insertions, 1 deletions

diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php
index 720c277..ff6ded1 100755
--- a/usr/local/www/wizard.php
+++ b/usr/local/www/wizard.php
@@ -74,7 +74,7 @@ if(empty($xml)) {
 }
 
 if (!is_array($pkg)) {
-	print_info_box_np(printf(gettext("ERROR: Could not parse %s/wizards/%s file."),$g['www_path'],$xml));
+	print_info_box_np(sprintf(gettext("ERROR: Could not parse %s/wizards/%s file."),$g['www_path'],$xml));
 	die;
 }