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

[James Liggett <jrliggett src gnome org>]

commit 76a7354f206729c13b2a6493e28558b2a00ea2cb
Merge: 22697c7 2974d74
Author: James Liggett <jrliggett cox net>
Date:   Mon May 31 19:14:31 2010 -0700

    Merge branch 'master' into git-shell
    
    Conflicts:
    	po/nb.po

 NEWS                                               |   12 +
 configure.in                                       |    2 +-
 plugins/class-inheritance/class-inherit.c          |    6 +-
 plugins/file-wizard/file.c                         |    2 +-
 .../language-support-cpp-java/cpp-java-assist.c    |    6 +-
 .../message-view/anjuta-message-manager-plugin.ui  |  246 +-
 plugins/symbol-db/anjuta-tags/Makefile.am          |    1 +
 plugins/symbol-db/symbol-db-engine-core.c          |  507 +-
 plugins/symbol-db/symbol-db-engine-priv.h          |   13 +-
 plugins/symbol-db/tables.sql                       |   11 -
 po/POTFILES.in                                     |    2 -
 po/es.po                                           | 1252 ++--
 po/gl.po                                           | 1228 ++--
 po/id.po                                           | 7768 ++++++++++----------
 po/nb.po                                           | 1516 ++--
 15 files changed, 6485 insertions(+), 6087 deletions(-)
---