[tomboy/autosync: 229/241] Merge branch 'master' into autosync

[Sanford Armstrong <sharm src gnome org>]

commit afc121e6e543bdda240dc26fbc3fc44d3e43db47
Merge: 2c9314c e561265
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date:   Sat Jan 23 13:46:55 2010 -0800

    Merge branch 'master' into autosync

 Tomboy/Addins/Evolution/Evolution.addin.xml |    2 +-
 Tomboy/RecentChanges.cs                     |    3 +-
 help/Makefile.am                            |    2 +-
 help/zh_CN/zh_CN.po                         | 1682 +++++++++++++++++++++++
 po/LINGUAS                                  |    1 +
 po/ast.po                                   | 1922 +++++++++++++++++++++++++++
 po/bn.po                                    |  183 ++--
 po/eu.po                                    |  237 ++--
 po/it.po                                    |  245 ++--
 po/uk.po                                    |  263 ++--
 10 files changed, 4072 insertions(+), 468 deletions(-)
---