[Pkg-sugar-commit] [sugar-toolkit] 103/118: Merge commit 'upstream/0.84.9' into master-0.84

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.84.10-1
in repository sugar-toolkit.

commit ddcdaeebd7017f69d669fe153d7c21797ab664c0
Merge: b5126cf 6395818
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Mar 24 01:06:38 2010 +0100

    Merge commit 'upstream/0.84.9' into master-0.84

 Makefile.in                           |  17 +--
 aclocal.m4                            |  22 +++-
 config.guess                          | 196 ++++++++++++----------------------
 config.sub                            |  43 +++++---
 configure                             |  40 ++++---
 configure.ac                          |   2 +-
 ltmain.sh                             |   8 +-
 m4/ltversion.m4                       |  10 +-
 po/es.po                              |  48 ++++-----
 po/pt_BR.po                           | 168 +++++++++++++++++------------
 po/ur.po                              | 101 ++++++++++++------
 src/Makefile.in                       |   6 +-
 src/sugar/Makefile.in                 |   6 +-
 src/sugar/_sugarext.c                 |  32 +++---
 src/sugar/activity/Makefile.in        |   2 +-
 src/sugar/activity/activity.py        |   3 +-
 src/sugar/activity/activityfactory.py |   3 +-
 src/sugar/bundle/Makefile.in          |   2 +-
 src/sugar/datastore/Makefile.in       |   2 +-
 src/sugar/datastore/datastore.py      |  46 +++++++-
 src/sugar/graphics/Makefile.in        |   2 +-
 src/sugar/graphics/palette.py         |   2 +-
 src/sugar/presence/Makefile.in        |   2 +-
 src/sugar/profile.py                  |   6 +-
 24 files changed, 439 insertions(+), 330 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-toolkit.git