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

[James Liggett <jrliggett src gnome org>]

commit bbe94e262b157068d4f1168d0634a961af31c83b
Merge: 0047a03 20e0848
Author: James Liggett <jrliggett cox net>
Date:   Wed Sep 15 22:34:31 2010 -0700

    Merge branch 'master' into git-shell

 NEWS                                               |   14 +
 configure.in                                       |    2 +-
 libanjuta/Makefile.am                              |    4 +-
 libanjuta/interfaces/anjuta-idl-compiler.pl        |   21 +-
 libanjuta/interfaces/libanjuta.idl                 |  274 +-
 manuals/anjuta-manual/Makefile.am                  |    2 +-
 manuals/anjuta-manual/fr/fr.po                     |   34 +-
 manuals/anjuta-manual/ja/ja.po                     | 5248 +++++++++
 .../python-loader/anjuta-python-loader.plugin.in   |    2 +-
 plugins/snippets-manager/plugin.c                  |   10 +
 plugins/sourceview/sourceview-io.c                 |    2 +-
 po/de.po                                           |  335 +-
 po/en_GB.po                                        |  246 +-
 po/es.po                                           |   14 +-
 po/fr.po                                           |  229 +-
 po/hu.po                                           |  117 +-
 po/id.po                                           |   34 +-
 po/ja.po                                           |11971 ++++++++++++--------
 po/nb.po                                           | 3024 +++---
 po/sv.po                                           |  788 +-
 po/zh_CN.po                                        | 1130 ++-
 21 files changed, 16310 insertions(+), 7191 deletions(-)
---