[gnome-applets/wip/dont-use-deprecated: 10/11] Merge branch 'master' into wip/dont-use-deprecated

[Enrico Minack <eminack src gnome org>]

commit c4c9a0a7ce7737a20a128851145682b7f9fb2a12
Merge: 18dfc7d 31e2b12
Author: Enrico Minack <enrico-minack gmx de>
Date:   Mon May 2 21:57:40 2011 +0200

    Merge branch 'master' into wip/dont-use-deprecated

 configure.in                               |    2 +-
 mini-commander/src/Makefile.am             |    2 +-
 mini-commander/src/command_line.c          |   83 +-
 mini-commander/src/exec.c                  |   26 +-
 mini-commander/src/mini-commander_applet.c |    5 +-
 mini-commander/src/preferences.c           |   14 +-
 mixer/Makefile.am                          |    2 +-
 mixer/applet.c                             |   88 +-
 mixer/dock.c                               |    5 +-
 mixer/preferences.c                        |    5 +-
 po/de.po                                   | 2111 ++++++++--------------------
 11 files changed, 665 insertions(+), 1678 deletions(-)
---