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

[James Liggett <jrliggett src gnome org>]

commit e51cf9d348c82a6e0b011fbf9d9090745115ab83
Merge: 34a4763 b6818ab
Author: James Liggett <jrliggett cox net>
Date:   Thu Jul 8 00:06:48 2010 -0700

    Merge branch 'master' into git-shell
    
    Conflicts:
    	libanjuta/Makefile.am

 configure.in                              |  171 +-
 launcher/Makefile.am                      |    4 +-
 libanjuta/Makefile.am                     |   15 +-
 libanjuta/anjuta-ui.c                     |  907 +-
 libanjuta/interfaces/libanjuta.idl        |   15 +-
 libfoocanvas/Makefile.am                  |    8 +-
 plugins/debug-manager/command.c           |    5 +-
 plugins/debug-manager/debug_tree.c        |    4 +-
 plugins/gdb/Makefile.am                   |    6 +-
 plugins/gdb/anjuta-gdb.plugin.in          |    2 +-
 plugins/gdb/anjuta-gdb.ui                 |  124 +
 plugins/gdb/debugger.c                    |  122 +-
 plugins/gdb/debugger.h                    |   11 +-
 plugins/gdb/plugin.c                      |   66 +-
 plugins/gdb/preferences.c                 |  467 +
 plugins/gdb/preferences.h                 |   48 +
 plugins/js-debugger/debugger-js.c         |    2 +
 plugins/run-program/execute.c             |   16 +-
 plugins/symbol-db/anjuta-tags/Makefile.am |    8 +-
 plugins/symbol-db/benchmark/Makefile.am   |    5 +-
 plugins/symbol-db/plugin.c                |   23 +-
 plugins/symbol-db/symbol-db-model-file.c  |    4 +-
 plugins/symbol-db/symbol-db-query.c       |    3 +-
 plugins/terminal/terminal.c               |   72 +-
 po/es.po                                  |  207 +-
 po/sl.po                                  |22040 ++++++++++++++---------------
 26 files changed, 12226 insertions(+), 12129 deletions(-)
---