[gnome-shell/datetime: 23/24] Fix merge conflicts

[David Zeuthen <davidz src gnome org>]

commit 137ea12109744f4b6d099e433f0961ddc22504c2
Merge: 0b866a6 6024b87
Author: David Zeuthen <davidz redhat com>
Date:   Mon Dec 20 11:55:36 2010 -0500

    Fix merge conflicts

 .gitignore                         |    1 +
 configure.ac                       |   15 +-
 data/Makefile.am                   |    1 +
 data/gs-applications.menu          |   70 ++++-
 data/theme/filter-selected.svg     |   81 ++++++
 data/theme/gnome-shell.css         |   30 ++-
 js/Makefile.am                     |    2 +
 js/misc/config.js.in               |    3 +
 js/ui/appDisplay.js                |  142 ++++++-----
 js/ui/iconGrid.js                  |   12 +-
 js/ui/main.js                      |    1 +
 js/ui/messageTray.js               |   76 +++++-
 js/ui/notificationDaemon.js        |   99 +++++---
 js/ui/overview.js                  |   24 +--
 js/ui/panel.js                     |   47 +++--
 js/ui/panelMenu.js                 |    2 +-
 js/ui/popupMenu.js                 |  503 ++++++++++++++++++++----------------
 js/ui/status/bluetooth.js          |  446 ++++++++++++++++++++++++++++++++
 js/ui/status/power.js              |   11 +-
 js/ui/workspace.js                 |   35 ++-
 po/es.po                           |  145 ++++++-----
 po/et.po                           |  236 ++++++++++++++---
 po/he.po                           |  100 ++++----
 po/nb.po                           |   90 +++++--
 src/Makefile.am                    |    2 +
 src/gnome-shell-plugin.c           |    9 +-
 src/st/st-texture-cache.c          |   26 ++-
 tests/interactive/border-radius.js |   27 +-
 tests/interactive/borders.js       |   81 +++---
 tools/build/gnome-shell.modules    |   10 +
 30 files changed, 1688 insertions(+), 639 deletions(-)
---