[conduit/syncml: 12/13] Merge branch 'master' into syncml

[John Carr <johncarr src gnome org>]

commit e69b7c6d1d3d6470047689991052a30f0d9935eb
Merge: bc77a10... 52710b0...
Author: John Carr <john carr unrouted co uk>
Date:   Mon Jun 8 11:13:12 2009 +0100

    Merge branch 'master' into syncml

 conduit/DBus.py                              |   28 ++-
 conduit/modules/FlickrModule/FlickrModule.py |   35 ++--
 conduit/modules/iPodModule/iPodModule.py     |   39 ++--
 conduit/platform/FileGio.py                  |    2 +-
 po/de.po                                     |  334 ++++++++++++-------------
 po/es.po                                     |  341 ++++++++++++--------------
 test/soup/env/xvfb.py                        |   89 +++++++
 test/soup/modules/ipod.py                    |    6 +
 8 files changed, 481 insertions(+), 393 deletions(-)
---