[yelp-xsl/wip/if-1-0: 4/5] Merge branch 'master' into wip/if-1-0

[Shaun McCance <shaunm src gnome org>]

commit 80736df23ffa1158d34583787eb895acbad20252
Merge: 3592925 b35cdbd
Author: Shaun McCance <shaunm gnome org>
Date:   Wed Jan 18 11:50:15 2012 -0500

    Merge branch 'master' into wip/if-1-0

 .gitignore                                       |    3 +-
 configure.ac                                     |    3 +-
 doc/yelp-xsl/Makefile.am                         |    1 -
 xslt/Makefile.am                                 |    3 +-
 xslt/common/Makefile.am                          |   13 +-
 xslt/{gettext => common}/domains/Makefile.am     |    2 +-
 xslt/{gettext => common}/domains/msgs.xsl        |    0
 xslt/{gettext => common}/domains/yelp-xsl.pot    |    0
 xslt/{gettext => common}/domains/yelp-xsl.xml.in |    0
 xslt/common/html.xsl                             |    4 +-
 xslt/{gettext => common}/l10n-numbers.xsl        |    3 -
 xslt/{gettext/gettext.xsl => common/l10n.xsl}    |    0
 xslt/docbook/html/db2xhtml.xsl                   |    2 +-
 xslt/gettext/.gitignore                          |    1 -
 xslt/gettext/Makefile.am                         |    9 -
 xslt/mallard/common/mal-link.xsl                 |  292 ++++++++++++++++------
 xslt/mallard/html/mal2html-page.xsl              |    8 +-
 xslt/mallard/html/mal2xhtml.xsl                  |    2 +-
 yelp-xsl.pc.in                                   |    3 +-
 19 files changed, 240 insertions(+), 109 deletions(-)
---