From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 4 Feb 2009 18:52:29 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.04~69
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8d26eaa9a4309e9dbd173120be108b671edad2df?hp=73e18318a533c7915ab04806879aa7f7607c3516

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 8a6340f58..7b54caf99 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -95,7 +95,7 @@ EOF
 	
 	#translators: The first parameter is a filename, and the second is
 	#translators: a (probably not translated) error message.
-	open(OUT, ">$wrapper.c") || error(sprintf(gettext("failed to write %s: %s"), "$wrapper.c", $!));;
+	open(OUT, ">$wrapper.c") || error(sprintf(gettext("failed to write %s: %s"), "$wrapper.c", $!));
 	print OUT <<"EOF";
 /* A wrapper for ikiwiki, can be safely made suid. */
 #include <stdio.h>
diff --git a/pm_filter b/pm_filter
index 71f26fae8..4984f32d9 100755
--- a/pm_filter
+++ b/pm_filter
@@ -14,7 +14,7 @@ elsif (/VERSION_AUTOREPLACE/) {
 }
 elsif (/^use lib/) {
 	# The idea here is to figure out if the libdir the Makefile.PL
-	# was configure to use is in perl's normal search path.
+	# was configured to use is in perl's normal search path.
 	# If not, hard code it into ikiwiki.
 	if ((grep { $_ eq $libdir } @INC) &&
             (! exists $ENV{PERL5LIB} || ! length $ENV{PERL5LIB} ||