[library-web/new-website-style: 55/55] Merge branch 'master' into new-website-style

[Frederic Peters <fpeters src gnome org>]

commit 2cfc9cf3040572b8431bac86d28c1219af5f8f2b
Merge: d15fe85 f973fbd
Author: Frédéric Péters <fpeters 0d be>
Date:   Sat Mar 19 19:51:58 2011 +0100

    Merge branch 'master' into new-website-style
    
    Conflicts:
    	data/xslt/indexes.xsl

 data/xslt/indexes.xsl   |   94 ++---------------------------------------------
 data/xslt/robots.xsl    |   58 +++++++++++++++++++++++++++++
 data/xslt/sitemap.xsl   |   88 ++++++++++++++++++++++++++++++++++++++++++++
 src/app.py              |    2 +-
 src/config.py           |    3 +-
 src/defaults.lgorc      |    9 ++++
 src/document.py         |    9 +++-
 src/lgo.py              |   45 +++++++++++++++++-----
 src/modtypes/base.py    |    9 +++-
 src/modtypes/mallard.py |    3 +-
 src/overlay.py          |    6 ++-
 11 files changed, 214 insertions(+), 112 deletions(-)
---
diff --cc data/xslt/indexes.xsl
index 2f1beb0,c8a7934..cfec0d8
--- a/data/xslt/indexes.xsl
+++ b/data/xslt/indexes.xsl
@@@ -1001,10 -855,6 +917,8 @@@ var remove_cookie_text = "<xsl:value-o
        </xsl:apply-templates>
      </xsl:for-each>
      <xsl:apply-templates select="." mode="nightly"/>
 +    <xsl:apply-templates select="." mode="deprecated"/>
 +    <xsl:apply-templates select="." mode="languages"/>
-     <xsl:apply-templates select="." mode="sitemap"/>
-     <xsl:apply-templates select="." mode="robotstxt"/>
      <xsl:apply-templates select="home" mode="javascript"/>
    </xsl:template>