Merge branch 'master' into debian-master

diff --cc config.sh.sed.in
Simple merge

diff --cc templates/config.tmpl
index addbd8df4403a499319425a72a8c6bcf8142b2f0,3e91e260cd513291ed95b3d9b1b75f59571991a8..f7392b8953cf5cdb89988c50a6d2cdbdbe0f91b5
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -5,9 -5,9 +5,9 @@@
  
     organisation = 'Debian'
     project_homepage = 'http://www.debian.org/'
 -   packages_homepage = 'http://packages.debian.net/'
 +   packages_homepage = 'http://packages.debian.org/'
     searchformurl = packages_homepage
-    search_url = '/'
+    search_url = '/search'
     tags_url = 'http://debtags.alioth.debian.org/'
     bugs_url = 'http://bugs.debian.org/'
     pts_url = 'http://packages.qa.debian.org/'