Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

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

diff --cc trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp
Simple merge

diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 209c0f3,2e37889..b544870
--- 1/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
--- 2/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@@ -462,7 -433,7 +461,6 @@@ bool XdxfPlugin::makeCache(QString dir
      while (!reader.atEnd() && !stopped) {
  
          QCoreApplication::processEvents();
-        // usleep(50);
 -        //usleep(50);
          reader.readNext();
  
          if(reader.tokenType() == QXmlStreamReader::StartElement) {