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

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

diff --cc trunk/src/base/backbone/backbone.cpp
Simple merge

diff --cc trunk/src/base/backbone/backbone.h
Simple merge

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