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

Conflicts:
	src/plugins/stardict/stardict.pro

diff --cc src/plugins/stardict/stardict.pro
index c1cd23e,7401341..93c4f12
--- 1/src/plugins/stardict/stardict.pro
--- 2/src/plugins/stardict/stardict.pro
+++ b/src/plugins/stardict/stardict.pro
@@@ -14,7 -16,9 +16,10 @@@ SOURCES +=  
      TranslationStarDict.cpp \
      StarDictDialog.cpp \
      StarDialog.cpp \
 +    StarDictSettings.cpp
+     CompressedReader.cpp \
+     UncompressedReader.cpp \
+     StarDictReaderFactory.cpp
  
  
  HEADERS += \
@@@ -26,7 -30,10 +31,11 @@@
      ../../include/settings.h \
      ../../include/CommonDictInterface.h \
      StarDialog.h \
 +    StarDictSettings.h
+     CompressedReader.h \
+     UncompressedReader.h \
+     StarDictReaderFactory.h \
+     StarDictReader.h
  
  RESOURCES += \
      StarDict.qrc