[gnome-shell/datetime: 39/39] Merge branch 'master' into datetime

[David Zeuthen <davidz src gnome org>]

commit eb66993447dcba2bdfc6fe7726c8787f583f8f10
Merge: 7d5b451 c3e557b
Author: David Zeuthen <davidz redhat com>
Date:   Thu Oct 28 13:34:27 2010 -0400

    Merge branch 'master' into datetime

 configure.ac                    |    2 +-
 js/ui/notificationDaemon.js     |    2 +
 po/POTFILES.in                  |    1 +
 po/es.po                        |   35 ++++-
 po/he.po                        |   35 ++++-
 po/nb.po                        |  148 ++++++++++++++-----
 po/sl.po                        |  124 +++++++++++----
 po/zh_CN.po                     |  318 ++++++++++++++++++++++++++++++--------
 tools/build/gnome-shell.modules |    2 +-
 9 files changed, 516 insertions(+), 151 deletions(-)
---