[Pkg-sugar-commit] [sugar-toolkit] 07/10: Merge commit 'upstream/0.84.11' 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.11-1
in repository sugar-toolkit.

commit 7f0c29df40d4768f54bdeeeb73f2029e0e4d7e37
Merge: 42a0b1f 0d81649
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jul 21 09:48:15 2010 +0200

    Merge commit 'upstream/0.84.11' into master-0.84

 Makefile.in                        |    1 +
 aclocal.m4                         |   17 +-
 configure                          | 5868 +++++++++++++-----------------------
 configure.ac                       |    2 +-
 m4/intltool.m4                     |    2 +-
 src/Makefile.in                    |    1 +
 src/sugar/Makefile.in              |    1 +
 src/sugar/activity/Makefile.in     |    1 +
 src/sugar/bundle/Makefile.in       |    1 +
 src/sugar/bundle/activitybundle.py |   29 +-
 src/sugar/bundle/bundle.py         |    5 +-
 src/sugar/datastore/Makefile.in    |    1 +
 src/sugar/graphics/Makefile.in     |    1 +
 src/sugar/presence/Makefile.in     |    1 +
 14 files changed, 2087 insertions(+), 3844 deletions(-)

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