Merge branch 'nepomuk/resourceWatcher' of git://anongit.kde.org/kde-runtimeā€¦

Authored by vhanda on May 12 2011, 5:53 PM.

Description

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

Empty Commit

This commit is empty and does not affect any paths.