Merge r8655 from broken 1.10 branch

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index e3176e5..945825c 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -945,7 +945,7 @@ my @argv = @ARGV;
 
 GetOptions(
     'debug|d'             => \$debug,
-    'fork'                => \$fork,
+    'fork|f'              => \$fork,
     'help|?'              => \$help,
     'host=s'              => \$host,
     'port=s'              => \$port,