Merge branch 'xdxf' of ssh://drop.maemo.org/git/mdictionary into gui

Conflicts:
	trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp

diff --cc trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
index af2a463,465c62f..3622aa2
--- 1/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
--- 2/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
@@@ -121,4 -120,7 +121,9 @@@ bool XdxfPlugin::isAvailable() const 
      return true;
  }
  
+ uint XdxfPlugin::hash() const
+ {
+     return 1;
+ }
++
 +Q_EXPORT_PLUGIN2(xdxf, XdxfPlugin)