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

diff --cc src/plugins/stardict/CompressedReader.h
Simple merge

diff --cc src/plugins/xdxf/XdxfDictDownloader.cpp
index 1542e32,887fdf5..1b65408
--- 1/src/plugins/xdxf/XdxfDictDownloader.cpp
--- 2/src/plugins/xdxf/XdxfDictDownloader.cpp
+++ b/src/plugins/xdxf/XdxfDictDownloader.cpp
@@@ -27,8 -28,12 +27,10 @@@
  #include "XdxfDictDownloadProgressDialog.h"
  #include <QDebug>
  #include <QProcess>
 -
 -
  #include <bzlib.h>
+ #ifndef Q_WS_MAEMO_5
  #include <libtar.h>
+ #endif
  #include <stdio.h>
  #include <fcntl.h>