[gnome-control-center/wip/new-keybindings-ui: 17/20] Merge branch 'master' into wip/new-keybindings-ui

[Rodrigo Moya <rodrigo src gnome org>]

commit 10689e036daba90a9e7143e9d1c353c334468608
Merge: b71ebba 6e71955
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Thu Dec 9 10:43:19 2010 +0100

    Merge branch 'master' into wip/new-keybindings-ui

 panels/datetime/cc-datetime-panel.c          |    6 +-
 panels/datetime/set-timezone.c               |   15 +-
 panels/datetime/set-timezone.h               |   10 +-
 panels/display/display-capplet.ui            |    4 +-
 panels/display/xrandr-capplet.c              |   29 +-
 panels/mouse/gnome-mouse-panel.desktop.in.in |    2 +-
 panels/user-accounts/um-password-dialog.c    |    9 +-
 panels/user-accounts/um-user-panel.c         |    5 +-
 po/POTFILES.in                               |    1 +
 po/POTFILES.skip                             |    2 +-
 po/et.po                                     |  544 +++++++++-----------------
 po/he.po                                     |  147 ++++----
 12 files changed, 290 insertions(+), 484 deletions(-)
---