diff -r 73a1feb507fb -r bc78a40cd63c mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/group/ut_aoplugin.mmp
--- a/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/group/ut_aoplugin.mmp	Tue Aug 31 15:12:07 2010 +0300
+++ b/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/group/ut_aoplugin.mmp	Wed Sep 01 12:31:01 2010 +0100
@@ -42,15 +42,7 @@
 SOURCE                  ut_musresourcefinderutil.cpp
 SOURCE                  ut_muscallconferenceeventmonitor.cpp
 SOURCE                  ut_muscallmonitorbase.cpp
-SOURCE                  ut_musfactorysettings.cpp
-
-// STUBs for telephonyservice and serviceprovidersettings
-SOURCEPATH              ../Stubs/src
-SOURCE                  ccallinfoiter_stub.cpp 
-SOURCE                  ccallinformation_stub.cpp 
-SOURCE                  spentry_stub.cpp 
-SOURCE                  spsettings_stub.cpp
-
+SOURCE                  ut_musclirmonitor.cpp
 
 SOURCEPATH              ../../../src
 SOURCE                  musaopluginmain.cpp
@@ -64,7 +56,7 @@
 SOURCE                  muscallstatusmonitor.cpp
 SOURCE                  muscallconferencemonitor.cpp
 SOURCE                  muscallconferenceeventmonitor.cpp
-SOURCE                  musvoipcallmonitor.cpp
+SOURCE                  musclirmonitor.cpp
 
 SOURCEPATH              ../../../../../tsrc/etelstub/src
 SOURCE                  etelstub.cpp
@@ -73,23 +65,22 @@
 SOURCEPATH              ../../../../../tsrc/centralrepositorystub/src
 SOURCE                  centralrepositorystub.cpp
 SOURCEPATH              ../../../../../tsrc/musmanagerstub/src
-SOURCE    				musmanagerstub.cpp
+SOURCE    		          musmanagerstub.cpp
+SOURCEPATH              ../../../../../tsrc/featmgrstub/src
+SOURCE                  FeatMgr.cpp
 
+USERINCLUDE             ../../../../../tsrc/featmgrstub/inc
 USERINCLUDE               ../inc
-USERINCLUDE               ../../../inc
-USERINCLUDE               ../Stubs/inc
 USERINCLUDE               ../../../../../tsrc/propertystub/inc
 USERINCLUDE               ../../../../../tsrc/etelstub/inc
 USERINCLUDE               ../../../../../tsrc/centralrepositorystub/inc
-USERINCLUDE               ../../../../../tsrc/musmanagerstub/inc
 
 SYSTEMINCLUDE             ../../../inc
 SYSTEMINCLUDE             ../../../../../inc
 SYSTEMINCLUDE             ../../../../../tsrc/etelstub/inc
 SYSTEMINCLUDE             ../../../../../tsrc/propertystub/inc
 SYSTEMINCLUDE             ../../../../../tsrc/centralrepositorystub/inc
-SYSTEMINCLUDE		      ../../../../../tsrc/musmanagerstub/inc
-SYSTEMINCLUDE             /epoc32/include/platform/digia/eunit
+SYSTEMINCLUDE		  ../../../../../tsrc/musmanagerstub/inc
 
 APP_LAYER_SYSTEMINCLUDE
 
@@ -99,6 +90,6 @@
 LIBRARY                 euser.lib 
 LIBRARY                 bafl.lib
 LIBRARY                 efsrv.lib
-LIBRARY                 charconv.lib
+LIBRARY                 etel3rdparty.lib
 
 // End of file