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

Conflicts:
	trunk/src/base/backbone/backbone.cpp

diff --cc trunk/src/base/backbone/backbone.cpp
index ec9fc4f,ab5c2f7..c0803f4
--- 1/trunk/src/base/backbone/backbone.cpp
--- 2/trunk/src/base/backbone/backbone.cpp
+++ b/trunk/src/base/backbone/backbone.cpp
@@@ -136,9 -135,9 +136,15 @@@ void Backbone::search(QString word) 
  
   void Backbone::addDictionary(CommonDictInterface* dict) {
       dicts[dict] = 1;
++<<<<<<< HEAD
 +     connect(dict, SIGNAL(finalTranslation(QList<Translation*>)),
 +             this, SLOT(translation(QList<Translation*>)),
 +             Qt::QueuedConnection);
++=======
+      //connect(dict, SIGNAL(finalTranslation()),
+       //       this, SLOT(translation()),
+       //       Qt::UniqueConnection);
++>>>>>>> 22b7c270de4fcb536e0325485e69952ea88ebff7
   }