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

[Enrico Minack <eminack src gnome org>]

commit c225252721507f90e63f66a166c05402fb9da99b
Merge: ca6293c c6bcd36
Author: Enrico Minack <enrico-minack gmx de>
Date:   Sun Apr 17 18:51:27 2011 +0200

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

 configure.in                           |    3 +++
 invest-applet/invest/defs.py.in        |    1 +
 invest-applet/invest/networkmanager.py |   24 +++++++++++++++++++++++-
 3 files changed, 27 insertions(+), 1 deletions(-)
---