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

[Frederic Peters <fpeters src gnome org>]

commit 7ab1d253189414ef587ac50283b7d86a95f5ef62
Merge: c673315 14891b9
Author: Frédéric Péters <fpeters 0d be>
Date:   Sat Jun 19 23:29:28 2010 +0200

    Merge branch 'master' into release-team-commands

 doc/C/jhbuild.xml                            |   89 +-
 jhbuild/buildbot/status/web/build.py         |   14 +-
 jhbuild/buildbot/status/web/builder.py       |   26 +-
 jhbuild/buildbot/steps.py                    |    8 +-
 jhbuild/commands/base.py                     |    4 +-
 jhbuild/commands/bot.py                      |  129 +-
 jhbuild/commands/info.py                     |   11 +
 jhbuild/config.py                            |   16 +
 jhbuild/frontends/terminal.py                |    2 +
 jhbuild/main.py                              |   11 +
 jhbuild/modtypes/__init__.py                 |    6 +
 jhbuild/modtypes/cmake.py                    |    1 +
 jhbuild/moduleset.py                         |    4 +-
 jhbuild/versioncontrol/bzr.py                |  145 +-
 jhbuild/versioncontrol/git.py                |  242 +-
 modulesets/buildbot.modules                  |    9 +-
 modulesets/gnome-2.30.modules                |    8 +-
 modulesets/gnome-3.0.modules                 |  121 +-
 modulesets/gnome-external-deps-2.30.modules  |   14 +-
 modulesets/gnome-external-deps-3.0.modules   |  220 +-
 modulesets/gnome-external-deps-devel.modules |    2 +-
 modulesets/gnome-suites-2.28.modules         |   36 +-
 modulesets/gnome-suites-2.30.modules         |   81 +-
 modulesets/gnome-suites-3.0.modules          |  245 +-
 modulesets/gnome-suites-devel.modules        |    2 +-
 modulesets/moduleset.dtd                     |    7 +-
 modulesets/moduleset.rnc                     |  361 +-
 patches/libnl-include-fix.patch              |   11 +
 patches/libproxy-0.4-python-libdir.patch     |   32 +
 patches/nspr.config_64bits.patch             |   66 +
 patches/nspr.pkgconfig.patch                 |   11 +
 patches/sqlite-3.6.22.dlsym.patch            |10434 ++++++++++++++++++++++++++
 po/de.po                                     |  361 +-
 po/sl.po                                     |  414 +-
 34 files changed, 12131 insertions(+), 1012 deletions(-)
---