Merging in from trunk

diff --cc configure.ac
index 418990602e8e1d040406147b69f73554114bcd0b,fbfa2e5df6e0a3aa898443042112daeea23f1805..5e7c9aa31b16056c60570b3fda87fc6e9e69332f
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1021,9 -1008,6 +1021,7 @@@ Configuration
          Internal Python:          ${with_python}
          Internal Perl:            ${with_perl}
          Enable LittleCms:         ${enable_lcms}
-         Enable Inkboard:          ${with_inkboard}
-         Enable SSL in Inkboard:   ${with_inkboard_ssl}
 +        Enable DBUS               ${with_dbus} 
          Enable Poppler-Cairo:     ${enable_poppler_cairo}
          ImageMagick Magick++:     ${magick_ok}
          Libwpg:                   ${with_libwpg}

diff --cc src/Makefile.am
Simple merge

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

diff --cc src/file.cpp
Simple merge