[anjuta/git-shell: 61/61] Merge branch 'master' into git-shell

[James Liggett <jrliggett src gnome org>]

commit 8f5bc92c61a3ae49dad1c34aefb3fe8ead051680
Merge: 5049fd3 2771e24
Author: James Liggett <jrliggett cox net>
Date:   Thu Jul 15 16:31:00 2010 -0700

    Merge branch 'master' into git-shell

 NEWS                                               |   28 +
 configure.in                                       |    5 +-
 libanjuta/Makefile.am                              |   62 +-
 libanjuta/interfaces/Makefile.am.iface             |   24 +
 libanjuta/interfaces/libanjuta.idl                 |   19 +-
 plugins/debug-manager/debug_tree.c                 |  447 +-
 plugins/debug-manager/debug_tree.h                 |    5 +-
 plugins/debug-manager/locals.c                     |   45 +-
 plugins/debug-manager/plugin.c                     |    4 +-
 plugins/debug-manager/queue.c                      |   51 +-
 plugins/debug-manager/watch.c                      |   10 +-
 plugins/document-manager/plugin.c                  |    1 -
 plugins/gdb/debugger.c                             |    4 +-
 plugins/language-support-vala/Makefile.am          |   16 +-
 plugins/sourceview/sourceview.c                    |    1 -
 plugins/symbol-db/benchmark/Makefile.am            |   32 +-
 plugins/symbol-db/benchmark/data/hash_values.log   |20959 ++++++++++++++++++++
 plugins/symbol-db/benchmark/libgda/Makefile.am     |   32 +
 plugins/symbol-db/benchmark/libgda/libgda.c        |  312 +
 plugins/symbol-db/benchmark/sqlite/Makefile.am     |   30 +
 plugins/symbol-db/benchmark/sqlite/sqlite.c        |  179 +
 plugins/symbol-db/benchmark/symbol-db/Makefile.am  |   32 +
 plugins/symbol-db/benchmark/symbol-db/README       |   14 +
 .../benchmark/{ => symbol-db}/benchmark.c          |   17 +-
 .../benchmark/symbol-db/populate-test-dir.sh       |    8 +
 plugins/symbol-db/plugin.c                         |   18 +-
 plugins/symbol-db/symbol-db-engine-core.c          | 3245 +---
 plugins/symbol-db/symbol-db-engine-core.h          |    5 +-
 plugins/symbol-db/symbol-db-engine-priv.h          |  218 +-
 plugins/symbol-db/symbol-db-engine-utils.c         |   14 +-
 plugins/symbol-db/symbol-db-model-file.c           |    5 +-
 plugins/symbol-db/symbol-db-model-project.c        |   10 +-
 plugins/symbol-db/symbol-db-model-search.c         |    5 +-
 plugins/symbol-db/symbol-db-model.c                |    8 +-
 plugins/symbol-db/symbol-db-query.c                |   51 +-
 plugins/symbol-db/tables.sql                       |   43 +-
 po/POTFILES.in                                     |    2 +
 po/gl.po                                           |  650 +-
 po/zh_CN.po                                        | 6020 +++---
 39 files changed, 26082 insertions(+), 6549 deletions(-)
---