Merge branch 'master' into debian-master

Conflicts:

	templates/config.tmpl

diff --cc conf/apache.conf.sed.in
index fff631f5e4da0452f20913ae6ff37cd41fcdcad8,eba66647e2b9b35d243e56f9445e64df864bc0d4..953e507dc1cbc374866ed5ad37ddb9664e4e183b
--- 1/conf/apache.conf.sed.in
--- 2/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -111,9 -110,10 +112,10 @@@
     RewriteRule ^/about/ - [L]
     RewriteRule ^/[^/]+\.css - [L]
     RewriteRule ^/[^/]+\.js - [L]
+    RewriteRule ^/favicon.ico$ - [L]
  
 -#   RewriteRule ^/$ http://www.debian.org/distrib/packages
 -   RewriteRule ^/$ /index.html [L]
 +   RewriteRule ^/$ http://www.debian.org/distrib/packages
 +#   RewriteRule ^/$ /index.html [L]
     RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
     RewriteRule ^/changelog:(.+)$  http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
     RewriteRule ^/src:([^/]+)$ /source/$1 [R,L,NE]

diff --cc templates/config.tmpl
index dc836b92084d501c9bab20c7324d18e452f32506,e4ccf7210df2a181afd7048e4d45b635413d746e..addbd8df4403a499319425a72a8c6bcf8142b2f0
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -4,8 -4,8 +4,8 @@@
     ddtp_lang = 'en'
  
     organisation = 'Debian'
-    homepage = 'http://www.debian.org/'
+    project_homepage = 'http://www.debian.org/'
 -   packages_homepage = 'http://packages.debian.net/'
 +   packages_homepage = 'http://packages.debian.org/'
     searchformurl = packages_homepage
     search_url = '/'
     tags_url = 'http://debtags.alioth.debian.org/'