Git commit 2d7221ecd211dc8a37696eae26b1dc6626c07eef by Vishesh Handa.
Committed on 12/05/2011 at 17:53.
Pushed by lueck into branch 'master'.

Merge branch 'nepomuk/resourceWatcher' of git://anongit.kde.org/kde-runtime=
 into nepomuk/resourceWatcher

Conflicts:
	nepomuk/services/storage/CMakeLists.txt
	nepomuk/services/storage/repository.cpp
	nepomuk/services/storage/repository.h


http://commits.kde.org/konqueror/2d7221ecd211dc8a37696eae26b1dc6626c07eef