[libchamplain: 3/3] Merge branch 'libchamplain-0-4'

[Pierre-Luc Beaudoin <plbeaudoin src gnome org>]

commit 3bff2b38d22e8a102a3acec3cbc0e8f4523a49fb
Merge: d0de19f f0102a8
Author: Pierre-Luc Beaudoin <pierre-luc pierlux com>
Date:   Tue Feb 16 16:34:55 2010 -0500

    Merge branch 'libchamplain-0-4'

 champlain/champlain-marker.c |    2 +-
 champlain/champlain-view.c   |   93 +++++++++++++++++++++++++++++++++--------
 2 files changed, 76 insertions(+), 19 deletions(-)
---