[gnome-pilot/dbus: 6/6] Merge branch 'master' into dbus

[Matthew Charles Davey <mcdavey src gnome org>]

commit 825af32846a8de5eb155f1032f5b07f9a1693898
Merge: eba0303 2564c59
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Tue Jul 27 19:34:50 2010 +0100

    Merge branch 'master' into dbus

 ChangeLog                                    |    6 +
 applet/pilot.c                               |    2 +
 capplet/gpilotd-control-applet.desktop.in.in |    1 -
 po/da.po                                     |  870 +++++-----
 po/eu.po                                     |  808 +++++-----
 po/gl.po                                     | 2458 +++++++++++---------------
 6 files changed, 1882 insertions(+), 2263 deletions(-)
---