[jhbuild/release-team-commands: 68/70] Merge branch 'master' into release-team-commands

[Frederic Peters <fpeters src gnome org>]

commit 89f7d1db7fbad5e4fc3d38c2725e3b323c9be1f9
Merge: 2755056... 93e6091...
Author: Frédéric Péters <fpeters 0d be>
Date:   Thu Jul 23 14:35:14 2009 +0200

    Merge branch 'master' into release-team-commands
    
    Conflicts:
    	modulesets/gnome-external-deps-2.28.modules

 Makefile.am                                 |    3 +
 Makefile.plain                              |    2 +-
 NEWS                                        |   29 +-
 README                                      |    2 +-
 configure.ac                                |    2 +-
 doc/C/jhbuild.xml                           |   11 +-
 doc/es/es.po                                |  319 +++---
 jhbuild/buildbot/changes.py                 |  136 +--
 jhbuild/config.py                           |   41 +-
 jhbuild/cut_n_paste/Makefile.am             |    1 -
 jhbuild/cut_n_paste/optparse.py             | 2008 ---------------------------
 jhbuild/frontends/gtkui.py                  |    9 +-
 jhbuild/frontends/terminal.py               |   21 +-
 jhbuild/modtypes/__init__.py                |   54 +-
 jhbuild/modtypes/ant.py                     |   20 +-
 jhbuild/modtypes/autotools.py               |   17 +-
 jhbuild/modtypes/cmake.py                   |   17 +-
 jhbuild/modtypes/distutils.py               |   17 +-
 jhbuild/modtypes/perl.py                    |   17 +-
 jhbuild/modtypes/tarball.py                 |   13 +-
 jhbuild/modtypes/testmodule.py              |   21 +-
 jhbuild/modtypes/waf.py                     |   17 +-
 jhbuild/monkeypatch.py                      |   49 +-
 jhbuild/versioncontrol/hg.py                |    2 +-
 jhbuild/versioncontrol/tarball.py           |   49 +-
 modulesets/bootstrap.modules                |    9 +-
 modulesets/freedesktop-2.28.modules         |    5 +-
 modulesets/gnome-2.18.modules               |    6 +-
 modulesets/gnome-2.20.modules               |    6 +-
 modulesets/gnome-2.22.modules               |    6 +-
 modulesets/gnome-2.24.modules               |   47 +-
 modulesets/gnome-2.26.modules               |   52 +-
 modulesets/gnome-2.28.modules               |  177 ++-
 modulesets/gnome-external-deps-2.26.modules |   18 +-
 modulesets/gnome-external-deps-2.28.modules |  228 +++-
 modulesets/gnome-suites-2.26.modules        |    6 +-
 modulesets/gnome-suites-2.28.modules        |  110 +-
 modulesets/mobile-2.24.modules              |    1 -
 modulesets/mobile-2.26.modules              |    1 -
 modulesets/mobile-2.28.modules              |    1 -
 modulesets/moduleset.dtd                    |    6 +-
 modulesets/moduleset.rnc                    |    4 +-
 modulesets/pimlico.modules                  |   42 -
 po/POTFILES.in                              |    1 -
 po/POTFILES.skip                            |    1 +
 po/es.po                                    |  601 +++++----
 po/fr.po                                    |  364 ++---
 po/sv.po                                    |  344 +++---
 tests/tests.py                              |    3 +
 49 files changed, 1513 insertions(+), 3403 deletions(-)
---