Merge branch 'archweb' into archweb-generic2

Conflicts:
	devel/views.py
	feeds.py
	public/views.py
	settings.py
	sitestatic/archweb.js
	templates/base.html
	templates/devel/profile.html
	templates/mirrors/status.html
	templates/news/view.html
	templates/packages/flaghelp.html
	templates/packages/opensearch.xml
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/registration/login.html
	templates/releng/results.html
	templates/todolists/public_list.html

5 files changed, 2 insertions, 4 deletions

diff --git a/retro/static/2002/main.css b/retro/static/2002/main.css
index fb8d4a68..ea33cfae 100644
--- a/retro/static/2002/main.css
+++ b/retro/static/2002/main.css
@@ -89,7 +89,6 @@ ul.list {
 }
 
 table.border {
-	background-image: url('bg.gif');
 	background-repeat: no-repeat;
 	background-color: #000000;
 	border-bottom: #cccccc 1px solid;
diff --git a/retro/static/2003/main.css b/retro/static/2003/main.css
index a9aa1dd8..b9b2330d 100644
--- a/retro/static/2003/main.css
+++ b/retro/static/2003/main.css
@@ -140,7 +140,7 @@ table.box {
 }
 
 table.header {
-	background: #000000 url('bg.gif') no-repeat;
+	background: #000000;
 	border-bottom: #cccccc 1px solid;
 	border-left: #cccccc 1px solid;
 	border-right: #cccccc 1px solid;
@@ -231,7 +231,6 @@ th {
 }
 
 th.row {
-	background: url('grid.png');
 }
 
 th.rowhdr {
@@ -243,7 +242,7 @@ th.rowhdr {
 
 td.box_headline {
 	color: #dddddd;
-	background: #000000 url('bg.gif') no-repeat;
+	background: #000000;
 	border-bottom: #cccccc 1px solid;
 	padding: 0px;
 }
diff --git a/retro/static/2007/logo.png b/retro/static/2007/logo.png
index b2b6d863..44968cd1 100644
--- a/retro/static/2007/logo.png
+++ b/retro/static/2007/logo.png
diff --git a/retro/static/2008/logo.png b/retro/static/2008/logo.png
index b2b6d863..44968cd1 100644
--- a/retro/static/2008/logo.png
+++ b/retro/static/2008/logo.png
diff --git a/retro/static/2009/sevenl_button.png b/retro/static/2009/sevenl_button.png
index 131b4dc8..93adcdf0 100644
--- a/retro/static/2009/sevenl_button.png
+++ b/retro/static/2009/sevenl_button.png