Merge from trunk

diff --cc Makefile.am
Simple merge

diff --cc autogen.sh
Simple merge

diff --cc configure.ac
index e6c379d48b3e7dd64b3bf19b80377197f99afe53,3835f620e263e6b054c17889de09ec41d8b64c53..0a8ad3a2cfcb0b40aec799f9a231b89884430b40
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -30,9 -30,8 +30,9 @@@ AM_PROG_CC_STD
  AM_PROG_AS
  AC_PROG_RANLIB
  AC_PROG_INTLTOOL(0.22)
 +AC_PROG_LIBTOOL
  AC_HEADER_STDC
- INK_SVN_SNAPSHOT_BUILD
+ INK_BZR_SNAPSHOT_BUILD
  
  dnl If automake 1.11 shave the output to look nice
  m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@@ -957,10 -995,8 +1023,9 @@@ src/extension/implementation/makefil
  src/extension/internal/makefile
  src/extension/makefile
  src/extension/script/makefile
 +src/extension/dbus/wrapper/inkdbus.pc
  src/filters/makefile
  src/helper/makefile
- src/inkjar/makefile
  src/io/makefile
  src/libcroco/makefile
  src/libgdl/makefile

diff --cc src/Makefile.am
index 9d51775194b1d535f19fe3f3ec6c1b86e81f3b42,74bfa01d6c98cb8f09b3798efbf2e56e629bbc73..7cd194eea3232946dec59d429b7e953a5fd915a3
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -149,10 -138,10 +146,10 @@@ include trace/Makefile_inser
  include 2geom/Makefile_insert
  
  # Extra files not mentioned as sources to include in the source tarball
 -EXTRA_DIST =  \
 +EXTRA_DIST += \
        $(top_srcdir)/Doxyfile  \
        sp-skeleton.cpp sp-skeleton.h   \
-       algorithms/makefile.in  \
+       util/makefile.in        \
        application/makefile.in \
        bind/makefile.in        \
        debug/makefile.in       \

diff --cc src/display/sp-canvas.cpp
index e640911d66ce9cba1d5292fdbfbd5fb4958e8e1a,c6778c8c5ec56fe8dbe5f8472fb6a15827a35946..e39fef45b2186df76e3b668024559264f8cb5df5
--- 1/src/display/sp-canvas.cpp
--- 2/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@@ -2085,11 -2111,8 +2113,11 @@@ paint (SPCanvas *canvas
  static int
  do_update (SPCanvas *canvas)
  {
-     if (!canvas->root || !canvas->pixmap_gc) // canvas may have already be destroyed by closing desktop durring interrupted display!
+     if (!canvas->root || !canvas->pixmap_gc) // canvas may have already be destroyed by closing desktop during interrupted display!
          return TRUE;
 +        
 +    if (canvas->drawing_disabled)
 +        return TRUE;
  
      /* Cause the update if necessary */
      if (canvas->need_update) {

diff --cc src/display/sp-canvas.h
Simple merge

diff --cc src/extension/init.cpp
Simple merge

diff --cc src/selection.h
Simple merge