[jhbuild/desktop-testing: 156/156] Merge branch 'master' into desktop-testing

[John Carr <johncarr src gnome org>]

commit 9a780abac8b271282a55d9b7cce985565cac06e1
Merge: a5c4025... e098dbb...
Author: John Carr <john carr unrouted co uk>
Date:   Sat Jun 20 21:10:22 2009 +0100

    Merge branch 'master' into desktop-testing

 Makefile.am                                  |    2 +-
 Makefile.plain                               |   39 +-
 NEWS                                         |  100 ++
 buildbot/Makefile                            |   19 -
 buildbot/Makefile.am                         |   52 ++
 configure.ac                                 |    4 +-
 doc/C/jhbuild.xml                            |   13 +-
 doc/es/es.po                                 |  891 ++++++++++---------
 doc/fr/fr.po                                 | 1256 +++++++++++---------------
 jhbuild/commands/Makefile.am                 |    4 +-
 jhbuild/commands/base.py                     |   88 +--
 jhbuild/commands/bot.py                      |   15 +-
 jhbuild/commands/checkbranches.py            |    2 +-
 jhbuild/commands/gui.py                      |   27 +-
 jhbuild/commands/sanitycheck.py              |    3 +
 jhbuild/commands/tinderbox.py                |   17 +-
 jhbuild/commands/uninstall.py                |   23 +-
 jhbuild/config.py                            |  141 +++-
 jhbuild/defaults.jhbuildrc                   |   29 +-
 jhbuild/frontends/Makefile.am                |    2 +-
 jhbuild/frontends/__init__.py                |    2 +-
 jhbuild/frontends/autobuild.py               |    2 +-
 jhbuild/frontends/buildscript.py             |   23 +-
 jhbuild/frontends/gtkui.py                   | 1053 ++++++++++++++--------
 jhbuild/frontends/jhbuild.glade              |  534 -----------
 jhbuild/frontends/terminal.py                |   22 +-
 jhbuild/modtypes/__init__.py                 |    7 +-
 jhbuild/modtypes/perl.py                     |    2 +-
 jhbuild/modtypes/tarball.py                  |    4 +-
 jhbuild/moduleset.py                         |    4 +-
 jhbuild/monkeypatch.py                       |    5 +
 jhbuild/utils/cmds.py                        |   10 +-
 jhbuild/utils/httpcache.py                   |    4 +
 jhbuild/utils/packagedb.py                   |    2 +-
 jhbuild/utils/subprocess_win32.py            |  136 +++
 jhbuild/utils/trayicon.py                    |    4 +-
 jhbuild/versioncontrol/__init__.py           |    4 +
 jhbuild/versioncontrol/git.py                |  139 ++-
 jhbuild/versioncontrol/tarball.py            |   16 +-
 modulesets/bootstrap.modules                 |   64 +-
 modulesets/freedesktop-2.26.modules          |   13 -
 modulesets/freedesktop-2.28.modules          |   15 +-
 modulesets/freedesktop-devel.modules         |   18 -
 modulesets/gnome-2.16.modules                |    2 +-
 modulesets/gnome-2.18.modules                |    2 +-
 modulesets/gnome-2.26.modules                |    8 +-
 modulesets/gnome-2.28.modules                |   66 ++-
 modulesets/gnome-devel.modules               |   30 +-
 modulesets/gnome-external-deps-2.22.modules  |    2 +-
 modulesets/gnome-external-deps-2.24.modules  |    4 +-
 modulesets/gnome-external-deps-2.26.modules  |   29 +-
 modulesets/gnome-external-deps-2.28.modules  |   83 +-
 modulesets/gnome-external-deps-devel.modules |   37 +-
 modulesets/gnome-suites-2.20.modules         |    2 +-
 modulesets/gnome-suites-2.22.modules         |    2 +-
 modulesets/gnome-suites-2.24.modules         |    2 +-
 modulesets/gnome-suites-2.26.modules         |   28 +-
 modulesets/gnome-suites-2.28.modules         |   52 +-
 modulesets/gnome-suites-devel.modules        |   15 +-
 patches/guile-1.8.5-libtool2.patch           |   55 ++
 po/POTFILES.in                               |    3 +-
 po/es.po                                     |  734 ++++++++-------
 po/fr.po                                     |  788 ++++++++++-------
 po/sv.po                                     |  984 +++++++++++---------
 scripts/Makefile.am                          |    1 +
 scripts/jhbuild.in                           |    5 +-
 tests/tests.py                               |   24 +-
 67 files changed, 4087 insertions(+), 3681 deletions(-)
---