Merge commit 'origin/master' into debian-master

diff --combined lib/Packages/Dispatcher.pm
index 037f7f36ace8798d00da5cf2d23cf1edd3bd13d6,e2b64ad0e409db45ff486fc630825a9dc0ec01a7..d99425e7310be5d44ddecb643978e367a425f5d9
--- 1/lib/Packages/Dispatcher.pm
--- 2/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@@ -15,7 -15,7 +15,7 @@@
  #
  #    You should have received a copy of the GNU General Public License
  #    along with this program; if not, write to the Free Software
- #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ #    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  
  package Packages::Dispatcher;
  
@@@ -138,7 -138,7 +138,7 @@@ sub do_dispatch 
  
      my $what_to_do = 'show';
      my $source = 0;
 -    if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
 +    if (my $path = $ENV{'PATH_INFO'} || $input->param('PATH_INFO')) {
        my @components = grep { $_ } map { lc $_ } split /\/+/, $path;
  
        debug( "PATH_INFO=$path components=@components", 3) if DEBUG;