[gnome-shell/zeitgeist: 120/120] Merge remote branch 'origin/master' into zeitgeist

[Federico Mena Quintero <federico src gnome org>]

commit 9551e1c2f5a4873597ddbba0f38c13b52ccee2f0
Merge: a70ea12 29d473f
Author: Federico Mena Quintero <federico gnome org>
Date:   Mon Mar 14 18:35:33 2011 -0400

    Merge remote branch 'origin/master' into zeitgeist

 configure.ac                           |   16 +-
 data/theme/gnome-shell.css             |   51 +-
 js/misc/gnomeSession.js                |   21 +
 js/perf/core.js                        |   96 +++-
 js/ui/dateMenu.js                      |   17 +-
 js/ui/environment.js                   |    5 +
 js/ui/main.js                          |   12 +-
 js/ui/overview.js                      |    5 +-
 js/ui/placeDisplay.js                  |   29 -
 js/ui/polkitAuthenticationAgent.js     |  157 +++--
 js/ui/popupMenu.js                     |   22 +-
 js/ui/scripting.js                     |  119 +++-
 js/ui/status/bluetooth.js              |   12 +-
 js/ui/status/volume.js                 |    7 +-
 js/ui/statusMenu.js                    |    5 +-
 js/ui/viewSelector.js                  |   20 +-
 js/ui/workspacesView.js                |    3 +
 po/LINGUAS                             |    1 +
 po/af.po                               | 1004 +++++++++++++++++++++++
 po/el.po                               |    4 +-
 po/es.po                               |   82 +-
 po/he.po                               |  177 +++--
 po/it.po                               |  173 +++--
 po/ko.po                               |  251 ++++---
 po/nl.po                               |  364 +++++----
 po/ro.po                               | 1375 ++++++++++++++++++++++----------
 po/uk.po                               |  172 +++--
 src/Makefile-gvc.am                    |    2 +-
 src/Makefile.am                        |    9 +-
 src/gnome-shell-jhbuild.in             |  101 ++-
 src/gvc/gvc-mixer-card.c               |    4 +-
 src/gvc/gvc-mixer-control.c            |  136 ++--
 src/gvc/gvc-mixer-control.h            |    3 +
 src/gvc/gvc-mixer-event-role.c         |   13 -
 src/gvc/gvc-mixer-sink-input.c         |   24 -
 src/gvc/gvc-mixer-sink.c               |   24 -
 src/gvc/gvc-mixer-source-output.c      |   13 -
 src/gvc/gvc-mixer-source.c             |   24 -
 src/gvc/gvc-mixer-stream.c             |   17 +-
 src/gvc/gvc-mixer-stream.h             |    2 +
 src/run-js-test.c                      |    3 +-
 src/shell-perf-helper.c                |  346 ++++++++
 src/shell-util.c                       |   39 +
 src/shell-util.h                       |    3 +
 src/st/st-entry.c                      |    5 +-
 src/st/st-entry.h                      |    4 +-
 src/st/st-label.c                      |    2 +-
 src/st/st-label.h                      |   10 +-
 src/st/st-scroll-view-fade.c           |   26 +-
 src/st/st-texture-cache.c              |   14 +-
 src/st/st-tooltip.c                    |    4 +-
 src/st/st-tooltip.h                    |   12 +-
 src/st/st-widget.h                     |    6 +-
 src/st/test-theme.c                    |    3 +-
 src/test-recorder.c                    |    3 +-
 tools/build/gnome-shell.modules        |    4 +-
 tools/build/libcanberra-quit-add.patch |   24 +
 57 files changed, 3707 insertions(+), 1373 deletions(-)
---