Merge branch 'master' into google

diff --combined src/mdictionary/backbone/backbone.cpp
index c8ad1da,0784e24..4ab57cc
--- 1/src/mdictionary/backbone/backbone.cpp
--- 2/src/mdictionary/backbone/backbone.cpp
+++ b/src/mdictionary/backbone/backbone.cpp
@@@ -65,6 -65,7 +65,6 @@@ public
          QString trans;
          trans = _tr->toXml();
          return trans;
 -
      }
  };
  
@@@ -274,6 -275,7 +274,7 @@@ void Backbone::addInternalDictionary(Co
  
   void Backbone::quit() {
      stopSearching();
+     usleep(100);
      Q_EMIT closeOk();
  }