Merge branch 'libchamplain-0-4'

diff --cc AUTHORS
index 2cbaee49d099dec5d0d246f2aff35d0cfbb16f68,bad8eb184b451d298780416f92ac04feefc28d9d..437f0055a164f2c5ebba6e839c4c8628df41b184
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -24,6 -24,6 +24,7 @@@ Frederic Peters <fpeters@0d.be
  Cosimo Cecchi <cosimoc@gnome.org>
  Vincent Untz <vuntz@gnome.org>
  Felix Riemann <friemann@gnome.org>
 +Cédric Bosdonnat <cedric.bosdonnat@free.fr>
  Halton Huo <halton.huo@sun.com>
  Bruce Cowan <bcowan@fastmail.co.uk>
+ Koop Mast <kwm@freebsd.org>

diff --cc champlain-gtk/Makefile.am
Simple merge

diff --cc configure.ac
index 1c6cf0414e6302c791a5708ec8f334e66f347bc4,cb3cc4550f8a5e2e7449934958d5cce3f5169ff6..8da527285e1d7535f5c2a806dca496f71c18dee7
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -28,7 -28,7 +28,7 @@@ AM_PROG_CC_C_
  AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
  
  # Checks for libraries.
- LIBRARY_VERSION=1:0:1
 -LIBRARY_VERSION=2:0:2
++LIBRARY_VERSION=0:0:0
  # API_VERSION is used to generate pc files only
  API_VERSION=api_version
  CHAMPLAIN_MAJOR_VERSION=champlain_major_version