Merge commit 'upstream/master' into prv/po

Conflicts:

	debian/control

1 files changed, 1 insertions, 1 deletions

diff --git a/pm_filter b/pm_filter
index 5ee5a1b98..71f26fae8 100755
--- a/pm_filter
+++ b/pm_filter
@@ -7,7 +7,7 @@ BEGIN {
 }
 
 if (/INSTALLDIR_AUTOREPLACE/) {
-	$_=qq{my \$installdir="$prefix";};
+	$_=qq{our \$installdir="$prefix";};
 }
 elsif (/VERSION_AUTOREPLACE/) {
 	$_=qq{our \$version="$ver";};