# HG changeset patch
# User hgs
# Date 1279083442 -10800
# Node ID 5210ffae7137c3b408bc2c936f7fe078066a9315
# Parent  aa5a574040a43dd5842d6b81686f78e0304f656e
201027

diff -r aa5a574040a4 -r 5210ffae7137 clfwrapper/BWINS/CONTENTLISTINGFRAMEWORKU.DEF
--- a/clfwrapper/BWINS/CONTENTLISTINGFRAMEWORKU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-EXPORTS
-	?NewContentListingEngineLC@ContentListingFactory@@SAPAVMCLFContentListingEngine@@XZ @ 1 NONAME ; public: static class MCLFContentListingEngine * __cdecl ContentListingFactory::NewContentListingEngineLC(void)
-	?NewModifiableItemLC@ContentListingFactory@@SAPAVMCLFModifiableItem@@XZ @ 2 NONAME ; public: static class MCLFModifiableItem * __cdecl ContentListingFactory::NewModifiableItemLC(void)
-	?NewSortingStyleLC@ContentListingFactory@@SAPAVMCLFSortingStyle@@AAVTResourceReader@@@Z @ 3 NONAME ; public: static class MCLFSortingStyle * __cdecl ContentListingFactory::NewSortingStyleLC(class TResourceReader &)
-	?NewSortingStyleLC@ContentListingFactory@@SAPAVMCLFSortingStyle@@XZ @ 4 NONAME ; public: static class MCLFSortingStyle * __cdecl ContentListingFactory::NewSortingStyleLC(void)
-
diff -r aa5a574040a4 -r 5210ffae7137 clfwrapper/BWINS/MediaCollectionManagerU.DEF
--- a/clfwrapper/BWINS/MediaCollectionManagerU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?CreateCollectionManagerL@MediaCollectionManagerFactory@@SAPAVMMediaCollectionManager@@XZ @ 1 NONAME ; class MMediaCollectionManager * MediaCollectionManagerFactory::CreateCollectionManagerL(void)
-
diff -r aa5a574040a4 -r 5210ffae7137 clfwrapper/BWINS/MediaCollectionManageru.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clfwrapper/BWINS/MediaCollectionManageru.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?CreateCollectionManagerL@MediaCollectionManagerFactory@@SAPAVMMediaCollectionManager@@XZ @ 1 NONAME ; class MMediaCollectionManager * MediaCollectionManagerFactory::CreateCollectionManagerL(void)
+
diff -r aa5a574040a4 -r 5210ffae7137 clfwrapper/BWINS/contentlistingframeworku.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clfwrapper/BWINS/contentlistingframeworku.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,6 @@
+EXPORTS
+	?NewContentListingEngineLC@ContentListingFactory@@SAPAVMCLFContentListingEngine@@XZ @ 1 NONAME ; public: static class MCLFContentListingEngine * __cdecl ContentListingFactory::NewContentListingEngineLC(void)
+	?NewModifiableItemLC@ContentListingFactory@@SAPAVMCLFModifiableItem@@XZ @ 2 NONAME ; public: static class MCLFModifiableItem * __cdecl ContentListingFactory::NewModifiableItemLC(void)
+	?NewSortingStyleLC@ContentListingFactory@@SAPAVMCLFSortingStyle@@AAVTResourceReader@@@Z @ 3 NONAME ; public: static class MCLFSortingStyle * __cdecl ContentListingFactory::NewSortingStyleLC(class TResourceReader &)
+	?NewSortingStyleLC@ContentListingFactory@@SAPAVMCLFSortingStyle@@XZ @ 4 NONAME ; public: static class MCLFSortingStyle * __cdecl ContentListingFactory::NewSortingStyleLC(void)
+
diff -r aa5a574040a4 -r 5210ffae7137 clfwrapper/EABI/ContentListingFrameworkU.DEF
--- a/clfwrapper/EABI/ContentListingFrameworkU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-EXPORTS
-	_ZN21ContentListingFactory17NewSortingStyleLCER15TResourceReader @ 1 NONAME
-	_ZN21ContentListingFactory17NewSortingStyleLCEv @ 2 NONAME
-	_ZN21ContentListingFactory19NewModifiableItemLCEv @ 3 NONAME
-	_ZN21ContentListingFactory25NewContentListingEngineLCEv @ 4 NONAME
-
diff -r aa5a574040a4 -r 5210ffae7137 clfwrapper/EABI/MediaCollectionManagerU.DEF
--- a/clfwrapper/EABI/MediaCollectionManagerU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_ZN29MediaCollectionManagerFactory24CreateCollectionManagerLEv @ 1 NONAME
-
diff -r aa5a574040a4 -r 5210ffae7137 clfwrapper/eabi/ContentListingFrameworku.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clfwrapper/eabi/ContentListingFrameworku.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,6 @@
+EXPORTS
+	_ZN21ContentListingFactory17NewSortingStyleLCER15TResourceReader @ 1 NONAME
+	_ZN21ContentListingFactory17NewSortingStyleLCEv @ 2 NONAME
+	_ZN21ContentListingFactory19NewModifiableItemLCEv @ 3 NONAME
+	_ZN21ContentListingFactory25NewContentListingEngineLCEv @ 4 NONAME
+
diff -r aa5a574040a4 -r 5210ffae7137 clfwrapper/eabi/MediaCollectionManageru.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clfwrapper/eabi/MediaCollectionManageru.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	_ZN29MediaCollectionManagerFactory24CreateCollectionManagerLEv @ 1 NONAME
+
diff -r aa5a574040a4 -r 5210ffae7137 contextengine/data/rd-key.pem
--- a/contextengine/data/rd-key.pem	Tue Jul 06 14:44:37 2010 +0300
+++ b/contextengine/data/rd-key.pem	Wed Jul 14 07:57:22 2010 +0300
@@ -1,15 +1,15 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDLRF+r1FGGkCwTrb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW4
-6Y+LWaA8HMlDdoHRB0FgASisYcFagwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh
-7W7Dt9F5FZij8F7/9Pi6+FhhxZFIf1DD+yry9D7+Sp+BgdNALe4XOpf25QIBAwKB
-gQCHgupyjYuvCsgNHn7PNtnvVxInrB5MQNoPli+O+uNJWUK/Q+57Rl+yO8AoEzDX
-pFaLWiuVVhsdloDnAgabT/FXzYncs6uOHyEUV+dSXb78vtLPJqAX+Fg2i3hOXreB
-yskcZ13/OsKVOu5wgrJkx2baZufkqMwOSytf5y9nwjEIKwJBAP+inobagVNrN62j
-KQva3cC+UN/6XnKdTc0CA6bHyLOaJoH1xiMwG/VS2PGjHI0tiSMNtLn/QPpHJ003
-iabGhdUCQQDLjp/9UjFT6K6CF66Chqf30pZXhx+GTSQZmv/gvZiMly7X9fX9BGX3
-2MbJohBC4yI21XKTbisWywkF73Hwh+TRAkEAqmxprzxWN5zPyRdwspHpKymLP/w+
-9xOJM1atGdqFzRFvAU6EF3Vn+OHl9my9s3OwwgkjJqorUYTE3iUGby8D4wJBAIe0
-aqjhdjfwdFa6dFcEb/qMZDpaFQQzbWZnVUB+ZbMPdI/5TqitmU/l2dvBYCyXbCSO
-TGJJcg8yBgP09qBamIsCQFL7j1tM0XPVQJQ89WpKCld7O9ORxRGVj1eG0tWijrH8
-mGbYh8SGCVoWV3vrKSS8GBrFVgQnqUaHuEdtM7tpCAQ=
------END RSA PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDLRF+r1FGGkCwTrb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW4
+6Y+LWaA8HMlDdoHRB0FgASisYcFagwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh
+7W7Dt9F5FZij8F7/9Pi6+FhhxZFIf1DD+yry9D7+Sp+BgdNALe4XOpf25QIBAwKB
+gQCHgupyjYuvCsgNHn7PNtnvVxInrB5MQNoPli+O+uNJWUK/Q+57Rl+yO8AoEzDX
+pFaLWiuVVhsdloDnAgabT/FXzYncs6uOHyEUV+dSXb78vtLPJqAX+Fg2i3hOXreB
+yskcZ13/OsKVOu5wgrJkx2baZufkqMwOSytf5y9nwjEIKwJBAP+inobagVNrN62j
+KQva3cC+UN/6XnKdTc0CA6bHyLOaJoH1xiMwG/VS2PGjHI0tiSMNtLn/QPpHJ003
+iabGhdUCQQDLjp/9UjFT6K6CF66Chqf30pZXhx+GTSQZmv/gvZiMly7X9fX9BGX3
+2MbJohBC4yI21XKTbisWywkF73Hwh+TRAkEAqmxprzxWN5zPyRdwspHpKymLP/w+
+9xOJM1atGdqFzRFvAU6EF3Vn+OHl9my9s3OwwgkjJqorUYTE3iUGby8D4wJBAIe0
+aqjhdjfwdFa6dFcEb/qMZDpaFQQzbWZnVUB+ZbMPdI/5TqitmU/l2dvBYCyXbCSO
+TGJJcg8yBgP09qBamIsCQFL7j1tM0XPVQJQ89WpKCld7O9ORxRGVj1eG0tWijrH8
+mGbYh8SGCVoWV3vrKSS8GBrFVgQnqUaHuEdtM7tpCAQ=
+-----END RSA PRIVATE KEY-----
diff -r aa5a574040a4 -r 5210ffae7137 contextengine/data/rd.cer
--- a/contextengine/data/rd.cer	Tue Jul 06 14:44:37 2010 +0300
+++ b/contextengine/data/rd.cer	Wed Jul 14 07:57:22 2010 +0300
@@ -1,17 +1,17 @@
------BEGIN CERTIFICATE-----
-MIICzDCCAjWgAwIBAgIBADANBgkqhkiG9w0BAQUFADArMRAwDgYDVQQKEwdSRCBD
-ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZTAeFw0wNDExMTUxMjQyMDZaFw0z
-NzA5MjMxMjQyMDZaMCsxEDAOBgNVBAoTB1JEIENlcnQxFzAVBgNVBAMTDlJEIENl
-cnRpZmljYXRlMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDLRF+r1FGGkCwT
-rb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW46Y+LWaA8HMlDdoHRB0FgASisYcFa
-gwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh7W7Dt9F5FZij8F7/9Pi6+FhhxZFI
-f1DD+yry9D7+Sp+BgdNALe4XOpf25QIBA6OCAQAwgf0wDAYDVR0TBAUwAwEB/zAL
-BgNVHQ8EBAMCAoQwHQYDVR0OBBYEFFi/kuGzxhVpjGxe9ZwlxC3fH9jFMFMGA1Ud
-IwRMMEqAFFi/kuGzxhVpjGxe9ZwlxC3fH9jFoS+kLTArMRAwDgYDVQQKEwdSRCBD
-ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZYIBADBsBgNVHSAEZTBjMGEGBFUd
-IAAwWTATBggrBgEFBQcCARYHaHR0cDovLzBCBggrBgEFBQcCAjA2GjRGb3IgUiZE
-IHVzYWdlIG9ubHkuIFRoaXMgY2VydGlmaWNhdGUgaXMgbm90IHRydXN0ZWQuMA0G
-CSqGSIb3DQEBBQUAA4GBAHGB4RQMAgBdeT2hxfOr6f2nA/dZm+M5yX5daUtZnET9
-Ed0A9sazLawfN2G1KFQT9kxEParAyoAkpbMAsRrnRz/9cM3OHgFm/NiKRnf50DpT
-7oCx0I/65mVD2kt+xXE62/Ii5KPnTufIkPi2uLvURCia1tTS8JmJ8dtxDGyQt8BR
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICzDCCAjWgAwIBAgIBADANBgkqhkiG9w0BAQUFADArMRAwDgYDVQQKEwdSRCBD
+ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZTAeFw0wNDExMTUxMjQyMDZaFw0z
+NzA5MjMxMjQyMDZaMCsxEDAOBgNVBAoTB1JEIENlcnQxFzAVBgNVBAMTDlJEIENl
+cnRpZmljYXRlMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDLRF+r1FGGkCwT
+rb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW46Y+LWaA8HMlDdoHRB0FgASisYcFa
+gwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh7W7Dt9F5FZij8F7/9Pi6+FhhxZFI
+f1DD+yry9D7+Sp+BgdNALe4XOpf25QIBA6OCAQAwgf0wDAYDVR0TBAUwAwEB/zAL
+BgNVHQ8EBAMCAoQwHQYDVR0OBBYEFFi/kuGzxhVpjGxe9ZwlxC3fH9jFMFMGA1Ud
+IwRMMEqAFFi/kuGzxhVpjGxe9ZwlxC3fH9jFoS+kLTArMRAwDgYDVQQKEwdSRCBD
+ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZYIBADBsBgNVHSAEZTBjMGEGBFUd
+IAAwWTATBggrBgEFBQcCARYHaHR0cDovLzBCBggrBgEFBQcCAjA2GjRGb3IgUiZE
+IHVzYWdlIG9ubHkuIFRoaXMgY2VydGlmaWNhdGUgaXMgbm90IHRydXN0ZWQuMA0G
+CSqGSIb3DQEBBQUAA4GBAHGB4RQMAgBdeT2hxfOr6f2nA/dZm+M5yX5daUtZnET9
+Ed0A9sazLawfN2G1KFQT9kxEParAyoAkpbMAsRrnRz/9cM3OHgFm/NiKRnf50DpT
+7oCx0I/65mVD2kt+xXE62/Ii5KPnTufIkPi2uLvURCia1tTS8JmJ8dtxDGyQt8BR
+-----END CERTIFICATE-----
diff -r aa5a574040a4 -r 5210ffae7137 contextengine/group/contextengine.mmp
--- a/contextengine/group/contextengine.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/contextengine/group/contextengine.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -47,7 +47,7 @@
 
 #if defined(WINS)
 deffile ../bwincw/contextenginewinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
 deffile ../eabi/contextenginearm.def
 #endif
 nostrictdef
diff -r aa5a574040a4 -r 5210ffae7137 contextengine/plugins/contextplugininterface/group/contextplugininterface.mmp
--- a/contextengine/plugins/contextplugininterface/group/contextplugininterface.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/contextengine/plugins/contextplugininterface/group/contextplugininterface.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -39,7 +39,7 @@
 
 #if defined(WINS)
     deffile ../bwincw/contextplugininterfacewinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
     deffile ../eabi/contextplugininterfacearm.def
 #endif
 nostrictdef
diff -r aa5a574040a4 -r 5210ffae7137 harvester/blacklistclient/group/blacklistclient.mmp
--- a/harvester/blacklistclient/group/blacklistclient.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/blacklistclient/group/blacklistclient.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -44,7 +44,7 @@
 deffile ../bwincw/blacklistclientwinscw.def
 #else 
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/blacklistclientarm.def
 #endif
 
diff -r aa5a574040a4 -r 5210ffae7137 harvester/client/group/harvesterclient.mmp
--- a/harvester/client/group/harvesterclient.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/client/group/harvesterclient.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -29,7 +29,7 @@
 
 #if defined(WINSCW)
 deffile ../bwincw/harvesterclientwinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
 deffile ../eabi/harvesterclientarm.def
 #endif
 nostrictdef
diff -r aa5a574040a4 -r 5210ffae7137 harvester/common/group/harvestercommon.mmp
--- a/harvester/common/group/harvestercommon.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/common/group/harvestercommon.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -29,7 +29,7 @@
 
 #if defined(WINSCW)
 deffile ../bwincw/harvestercommonwinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
 deffile ../eabi/harvestercommonarm.def
 #endif
 nostrictdef
diff -r aa5a574040a4 -r 5210ffae7137 harvester/common/group/harvesterdata.mmp
--- a/harvester/common/group/harvesterdata.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/common/group/harvesterdata.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -29,7 +29,7 @@
 
 #if defined(WINSCW)
     deffile ../bwincw/harvesterdatawinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
     deffile ../eabi/harvesterdataarm.def
 #endif
 nostrictdef
diff -r aa5a574040a4 -r 5210ffae7137 harvester/common/group/harvesterplugininterface.mmp
--- a/harvester/common/group/harvesterplugininterface.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/common/group/harvesterplugininterface.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -46,7 +46,7 @@
 
 #if defined(WINS)
     deffile ../bwincw/harvesterplugininterfacewinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
     deffile ../eabi/harvesterplugininterfacearm.def
 #endif
 nostrictdef
diff -r aa5a574040a4 -r 5210ffae7137 harvester/composerplugins/composerplugininterface/group/composerplugininterface.mmp
--- a/harvester/composerplugins/composerplugininterface/group/composerplugininterface.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/composerplugins/composerplugininterface/group/composerplugininterface.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -39,7 +39,7 @@
 
 #if defined(WINS)
     deffile ../bwincw/composerplugininterfacewinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
     deffile ../eabi/composerplugininterfacearm.def
 #endif
 nostrictdef
diff -r aa5a574040a4 -r 5210ffae7137 harvester/data/default_origin_mappings.db
--- a/harvester/data/default_origin_mappings.db	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/data/default_origin_mappings.db	Wed Jul 14 07:57:22 2010 +0300
@@ -1,39 +1,39 @@
-Process UID / Origin -mapping table
-
-UID         Origin
-200009EE	0
-101FFA91	0
-10208A29	0
-101FD659	1
-101FFA86	1
-2000D16B	1
-10208A6D	1
-101f857a  1
-10003a3f	2 
-101f4d90	2 
-1028242D	2 
-1028242E	2 
-101FFB51	2 
-101F8839	2
-101FFAAB	2 
-200071D8	2
-10008D60	2
-10008d39  2 
-1028190b  2 
-10008D5F  2 
-10008D60  2 
-10008D61  2 
-100058CA	4
-1028290B	4
-10281FA8	4
-10281FA7	4
-10281FA5	4
-10281FA6	4
-101FFA91  254
-20026F35  254
-20026F2F  254
-200009F5	255
-2000A7AE	255
-200071BE	255
-101f7771  255
-1020e519  255 
+Process UID / Origin -mapping table
+
+UID         Origin
+200009EE	0
+101FFA91	0
+10208A29	0
+101FD659	1
+101FFA86	1
+2000D16B	1
+10208A6D	1
+101f857a  1
+10003a3f	2 
+101f4d90	2 
+1028242D	2 
+1028242E	2 
+101FFB51	2 
+101F8839	2
+101FFAAB	2 
+200071D8	2
+10008D60	2
+10008d39  2 
+1028190b  2 
+10008D5F  2 
+10008D60  2 
+10008D61  2 
+100058CA	4
+1028290B	4
+10281FA8	4
+10281FA7	4
+10281FA5	4
+10281FA6	4
+101FFA91  254
+20026F35  254
+20026F2F  254
+200009F5	255
+2000A7AE	255
+200071BE	255
+101f7771  255
+1020e519  255 
diff -r aa5a574040a4 -r 5210ffae7137 harvester/monitorplugins/monitorplugininterface/group/monitorplugininterface.mmp
--- a/harvester/monitorplugins/monitorplugininterface/group/monitorplugininterface.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/monitorplugins/monitorplugininterface/group/monitorplugininterface.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -43,7 +43,7 @@
 
 #if defined(WINS)
     deffile ../bwincw/monitorplugininterfacewinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
     deffile ../eabi/monitorplugininterfacearm.def
 #endif
 nostrictdef
diff -r aa5a574040a4 -r 5210ffae7137 locationmanager/ReverseGeoCoderPlugin/data/2002DD11.rss
--- a/locationmanager/ReverseGeoCoderPlugin/data/2002DD11.rss	Tue Jul 06 14:44:37 2010 +0300
+++ b/locationmanager/ReverseGeoCoderPlugin/data/2002DD11.rss	Wed Jul 14 07:57:22 2010 +0300
@@ -15,7 +15,7 @@
 *
 */
 
-#include <ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
 
 RESOURCE REGISTRY_INFO theInfo
     {
diff -r aa5a574040a4 -r 5210ffae7137 locationmanager/ReverseGeoCoderPlugin/group/reversegeocoderplugin.mmp
--- a/locationmanager/ReverseGeoCoderPlugin/group/reversegeocoderplugin.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/locationmanager/ReverseGeoCoderPlugin/group/reversegeocoderplugin.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -25,15 +25,15 @@
 UID 0x10009D8D 0x2002DD11
 CAPABILITY CAP_ECOM_PLUGIN
 
-SOURCEPATH      ..\src
+SOURCEPATH      ../src
 SOURCE		proxy.cpp
 SOURCE		reversegeocoderplugin.cpp
 
 
-USERINCLUDE     ..\inc
-USERINCLUDE     ..\..\inc
-USERINCLUDE     ..\..\..\inc
-USERINCLUDE     ..\..\ReverseGeocode\inc
+USERINCLUDE     ../inc
+USERINCLUDE     ../../inc
+USERINCLUDE     ../../../inc
+USERINCLUDE     ../../ReverseGeocode/inc
 
 
 MW_LAYER_SYSTEMINCLUDE
@@ -41,7 +41,7 @@
 
 
 SOURCEPATH      ../data
-START RESOURCE  2002DD11.RSS
+START RESOURCE  2002DD11.rss
 TARGET          reversegeocoderplugin.rsc
 END
 
diff -r aa5a574040a4 -r 5210ffae7137 locationmanager/ReverseGeocode/group/bld.inf
--- a/locationmanager/ReverseGeocode/group/bld.inf	Tue Jul 06 14:44:37 2010 +0300
+++ b/locationmanager/ReverseGeocode/group/bld.inf	Wed Jul 14 07:57:22 2010 +0300
@@ -21,4 +21,4 @@
 PRJ_EXPORTS
 
 PRJ_MMPFILES
-ReverseGeocode.mmp
+reversegeocode.mmp
diff -r aa5a574040a4 -r 5210ffae7137 locationmanager/client/group/locationmanagerclient.mmp
--- a/locationmanager/client/group/locationmanagerclient.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/locationmanager/client/group/locationmanagerclient.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -20,7 +20,7 @@
 
 #if defined(WINSCW)
 deffile ../bwincw/locationmanagerclientwinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
 deffile ../eabi/locationmanagerclientarm.def
 #endif
 nostrictdef
diff -r aa5a574040a4 -r 5210ffae7137 locationmanager/geoconverter/group/bld.inf
--- a/locationmanager/geoconverter/group/bld.inf	Tue Jul 06 14:44:37 2010 +0300
+++ b/locationmanager/geoconverter/group/bld.inf	Wed Jul 14 07:57:22 2010 +0300
@@ -2,9 +2,9 @@
 * Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
diff -r aa5a574040a4 -r 5210ffae7137 locationmanager/geotagger/group/geotagger.mmp
--- a/locationmanager/geotagger/group/geotagger.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/locationmanager/geotagger/group/geotagger.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -45,8 +45,8 @@
 USERINCLUDE     ../../geoconverter/inc
 #endif
 
-USERINCLUDE     ../../reversegeocode/inc
-USERINCLUDE	../../reversegeocoderplugin/inc
+USERINCLUDE     ../../ReverseGeocode/inc
+USERINCLUDE	../../ReverseGeoCoderPlugin/inc
 
 
 SOURCEPATH      ../src
diff -r aa5a574040a4 -r 5210ffae7137 locationmanager/locationtrail/group/locationtrail.mmp
--- a/locationmanager/locationtrail/group/locationtrail.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/locationmanager/locationtrail/group/locationtrail.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -29,7 +29,7 @@
 
 #if defined(WINSCW)
 deffile ../bwincw/locationtrailwinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
 deffile ../eabi/locationtrailarm.def
 #endif
 nostrictdef
diff -r aa5a574040a4 -r 5210ffae7137 locationmanager/server/group/locationmanagerserver.mmp
--- a/locationmanager/server/group/locationmanagerserver.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/locationmanager/server/group/locationmanagerserver.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -44,7 +44,7 @@
 #ifdef _LOC_REVERSEGEOCODE
 MACRO LOC_REVERSEGEOCODE
 USERINCLUDE     ../../tagcreator/inc
-USERINCLUDE     ../../reversegeocode/inc 
+USERINCLUDE     ../../ReverseGeocode/inc 
 #endif
 
 
diff -r aa5a574040a4 -r 5210ffae7137 locationmanager/tagcreator/bwincw/tagcreatorwinscw.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locationmanager/tagcreator/bwincw/tagcreatorwinscw.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,7 @@
+EXPORTS
+	?CreateLocationTagsL@CTagCreator@@QAEXABVTPtrC16@@AAK01@Z @ 1 NONAME ; void CTagCreator::CreateLocationTagsL(class TPtrC16 const &, unsigned long &, class TPtrC16 const &, unsigned long &)
+	?SetSession@CTagCreator@@QAEXPAVCMdESession@@@Z @ 2 NONAME ; void CTagCreator::SetSession(class CMdESession *)
+	?AttachTagsL@CTagCreator@@QAEXKKK@Z @ 3 NONAME ; void CTagCreator::AttachTagsL(unsigned long, unsigned long, unsigned long)
+	?NewL@CTagCreator@@SAPAV1@XZ @ 4 NONAME ; class CTagCreator * CTagCreator::NewL(void)
+	??1CTagCreator@@UAE@XZ @ 5 NONAME ; CTagCreator::~CTagCreator(void)
+
diff -r aa5a574040a4 -r 5210ffae7137 locationmanager/tagcreator/eabi/tagcreatorarm.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locationmanager/tagcreator/eabi/tagcreatorarm.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,8 @@
+EXPORTS
+	_ZN11CTagCreator10SetSessionEP11CMdESession @ 1 NONAME
+	_ZN11CTagCreator11AttachTagsLEmmm @ 2 NONAME
+	_ZN11CTagCreator19CreateLocationTagsLERK7TPtrC16RmS2_S3_ @ 3 NONAME
+	_ZN11CTagCreator4NewLEv @ 4 NONAME
+	_ZTI11CTagCreator @ 5 NONAME
+	_ZTV11CTagCreator @ 6 NONAME
+
diff -r aa5a574040a4 -r 5210ffae7137 locationmanager/tagcreator/group/bld.inf
--- a/locationmanager/tagcreator/group/bld.inf	Tue Jul 06 14:44:37 2010 +0300
+++ b/locationmanager/tagcreator/group/bld.inf	Wed Jul 14 07:57:22 2010 +0300
@@ -2,9 +2,9 @@
 * Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
diff -r aa5a574040a4 -r 5210ffae7137 locationmanager/tagcreator/group/tagcreator.mmp
--- a/locationmanager/tagcreator/group/tagcreator.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/locationmanager/tagcreator/group/tagcreator.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -35,7 +35,7 @@
 USERINCLUDE     ../inc
 USERINCLUDE     ../../inc
 USERINCLUDE     ../../../inc
-USERINCLUDE     ../../reversegeocode/inc
+USERINCLUDE     ../../ReverseGeocode/inc
 
 
 
diff -r aa5a574040a4 -r 5210ffae7137 locationmanager/tagcreator/inc/ctagcreator.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locationmanager/tagcreator/inc/ctagcreator.h	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,128 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  A class for creating country and city tags for media files.
+*
+*/
+
+
+#ifndef C_TAGCREATOR_H
+#define C_TAGCREATOR_H
+
+#include "mdesession.h"
+#include "mdenamespacedef.h"
+#include <mdeconstants.h>
+
+/**
+ *
+ *  @since S60 9.2
+ */
+class CTagCreator : public CBase
+    {
+public:  
+    /**
+     * 2-phased constructor.
+     */
+    IMPORT_C static CTagCreator* NewL( );
+
+    /**
+     * C++ destructor.
+     */    
+    IMPORT_C virtual ~CTagCreator();
+    
+    /**
+     * Attach country and city tags to an image file/object.
+     * @param aObjectId, object Id for image/video to be tagged.
+     * @param aCountryTagId, a country tag Id.
+     * @param aCityTagId, a city tag Id.
+	   * @return None.
+     */
+   IMPORT_C void AttachTagsL( const TUint32 aObjectId, const TItemId aCountryTagId, 
+                              const TItemId aCityTagId );
+    /**
+     * Creates country and city tags.
+     * @param aCountry, a country name.
+     * @param aCountryTagId, reference to a country tag Id.
+     * @param aCity, a city name.
+     * @param aCityTagId, a reference to a city tag Id.
+	   * @return None.
+     */
+    IMPORT_C void CreateLocationTagsL( const TPtrC& aCountry, TItemId& aCountryTagId, 
+                                      const TPtrC& aCity, TItemId& aCityTagId );
+
+	/**
+	  * Sets the CMdESession for tag creation
+	  * @param aSession  the CMdESession object
+	  */
+    IMPORT_C void SetSession( CMdESession* aSession );
+
+public:
+
+	/**
+	  * Creates a tag for the country
+	  * @param aCountry country name
+	  * @param aCity city name
+	  * @param aCountryTagId   The country tag Id
+	  */    
+    void CreateTagForCountryL( const TPtrC& aCountry, 
+                TItemId& aCountryTagId );
+
+	/**
+	  * Creates a tag for the city
+	  * @param aCountry The country name
+	  * @param aCity   The city name
+	  *	@param aCityTagId  The city tag Id
+	  */		
+    void CreateTagForCityL( const TPtrC& aCountry, const TPtrC& aCity, TItemId& aCityTagId);
+    
+private:
+    /**
+     * C++ constructor.
+     */  
+    CTagCreator( );
+    
+    /**
+     * 2nd phase constructor.
+     */
+    void ConstructL();
+
+	/**
+	  * Creates a tag object and adds it to the database
+	  * @param aTitle  The title associated with the tag
+	  * @param aUri  The uri associated with the tag
+	  * @return The itemId of the newly created tag in the database	
+	  */	
+    TUint32 CreateTagL( const TPtrC& aTitle, 
+        const TPtrC& aUri, 
+        MdeConstants::Tag::TTagType aTagType );
+	/**
+	  * Finds if a tag with the given uri exists
+	  * @param  aUri The uri by which the tag is to be searched
+	  * @return  The ItemId of the tag if it exists,0 otherwise
+	  */	
+    
+    TUint32 TagExistsL( const TPtrC& aUri  );
+    
+private:
+
+	/**
+	  *  iMdeSession
+	  *  an instance of the CMdESession 
+	  */		
+    CMdESession* iMdeSession;
+    
+    };
+
+#endif // C_TAGCREATOR_H
+
+// End of file.
diff -r aa5a574040a4 -r 5210ffae7137 locationmanager/tagcreator/src/ctagcreator.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locationmanager/tagcreator/src/ctagcreator.cpp	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,307 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  A class for creating country and city tags for media files
+*
+*/
+
+#include "ctagcreator.h"
+#include "locationmanagerdebug.h"
+
+#include "mdccommon.h"
+#include "mdeobjectdef.h"
+#include "mdepropertydef.h"
+#include "mderelation.h"
+#include "mdequery.h"
+#include "mdeconstants.h"
+
+using namespace MdeConstants;
+
+_LIT ( KCountry, "country:");   // country:finland
+_LIT ( KCity, "city:");         // city:helsinki|country:finland
+_LIT ( KSeparator, "|" );       // Separator for city tag. Separate city and country.
+
+// --------------------------------------------------------------------------
+// CTagCreator::NewL
+// --------------------------------------------------------------------------
+//
+EXPORT_C CTagCreator* CTagCreator::NewL( )
+    {
+    LOG( "CTagCreator::NewL(), begin" );
+    CTagCreator* self = new (ELeave) CTagCreator( );
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+    LOG( "CTagCreator::NewL(), end" );
+    return self;
+    }
+        
+// --------------------------------------------------------------------------
+// CTagCreator::CTagCreator
+// --------------------------------------------------------------------------
+//  
+CTagCreator::CTagCreator(  ) 
+    {
+
+    }
+
+// --------------------------------------------------------------------------
+// CTagCreator::ConstructL
+// --------------------------------------------------------------------------
+//    
+void CTagCreator::ConstructL()
+    {
+    
+    }
+    
+// --------------------------------------------------------------------------
+// CTagCreator::~CTagCreator
+// --------------------------------------------------------------------------
+//    
+CTagCreator::~CTagCreator()
+    {
+  		
+    }
+
+// --------------------------------------------------------------------------
+// CTagCreator::SetMdeSession()
+// --------------------------------------------------------------------------
+//
+EXPORT_C void CTagCreator::SetSession(CMdESession* aSession)
+    {
+    iMdeSession = aSession;
+    }
+
+// ---------------------------------------------------------------------------
+// CTagCreator::CreateTagForCountryL() 
+// ---------------------------------------------------------------------------
+//
+void CTagCreator::CreateTagForCountryL( const TPtrC& aCountry, 
+                        TItemId& aCountryTagId )
+    {
+    LOG( "CTagCreator::CreateTagForCountryL - begin" );
+    
+    // Crete new string for uri, -> country:India.
+    TUint totalLength = ( aCountry.Length() + KCountry().Length() );
+    HBufC* buf = HBufC::NewLC( totalLength );
+    TPtr uriPtr = buf->Des();
+    _LIT(KCountryUriFormat, "%S%S");
+    uriPtr.Format(KCountryUriFormat, &(KCountry()), &aCountry); 
+    
+    // Check if there is allready tag for current country.
+    aCountryTagId = TagExistsL( uriPtr );
+       
+    if( !aCountryTagId )
+	   {
+	   // No tag, create tag for country.
+	   aCountryTagId = CreateTagL( aCountry, uriPtr, MdeConstants::Tag::ESystemDefineCountryTags);
+	   }  
+      
+    CleanupStack::PopAndDestroy( buf );
+    
+    LOG( "CTagCreator::CreateTagForCountryL - end" );
+    }
+
+// ---------------------------------------------------------------------------
+// CTagCreator::CreateTagForCityL() 
+// ---------------------------------------------------------------------------
+//
+void CTagCreator::CreateTagForCityL( const TPtrC& aCountry, const TPtrC& aCity, TItemId& aCityTagId )
+    {
+    LOG( "CTagCreator::CreateTagForCityL - begin" );
+
+    // Crete new string for uri, -> city:bangalore|country:india
+    TUint totalLength = ( aCity.Length() + KCity.iTypeLength +
+        aCountry.Length() + KCountry.iTypeLength + KSeparator.iTypeLength );
+    
+    HBufC* buf = HBufC::NewLC( totalLength );
+    TPtr uriPtr = buf->Des();
+    _LIT(KCityCountryUriFormat, "%S%S%S%S%S");
+    uriPtr.Format(KCityCountryUriFormat,
+                    &(KCity()),
+                    &aCity,
+                    &(KSeparator()),
+                    &(KCountry()),
+                    &aCountry);
+        
+    // Check if there is allready tag for current city.
+    aCityTagId = TagExistsL( uriPtr );
+	
+	if( !aCityTagId )
+		{
+		// No tag, create tag for city.
+		aCityTagId = CreateTagL( aCity, uriPtr, MdeConstants::Tag::ESystemDefineCityTags);
+		}
+    
+    CleanupStack::PopAndDestroy( buf );
+ 
+    LOG( "CTagCreator::CreateTagForCityL - end" );
+    }
+
+// ---------------------------------------------------------------------------
+// CTagCreator::CreateTagL 
+// ---------------------------------------------------------------------------
+//
+TUint32 CTagCreator::CreateTagL( const TPtrC& aTitle, 
+        const TPtrC& aUri,
+        MdeConstants::Tag::TTagType aTagType)
+    {
+    LOG( "CTagCreator::CreateTagL - begin" );
+
+    CMdENamespaceDef& defaultNamespace = iMdeSession->GetDefaultNamespaceDefL();
+    // Create tag object.
+    CMdEObjectDef& tagObjectDef = defaultNamespace.GetObjectDefL( Tag::KTagObject );
+
+	CMdEObject* tagObject = NULL;
+    tagObject = iMdeSession->NewObjectLC( tagObjectDef, aUri );
+	
+	// Type defs.
+	CMdEPropertyDef& creationDef = tagObjectDef.GetPropertyDefL(
+		Object::KCreationDateProperty );
+	CMdEPropertyDef& modifiedDef = tagObjectDef.GetPropertyDefL(
+		Object::KLastModifiedDateProperty );
+	CMdEPropertyDef& sizeDef = tagObjectDef.GetPropertyDefL(
+		Object::KSizeProperty );
+	CMdEPropertyDef& itemTypeDef = tagObjectDef.GetPropertyDefL(
+		Object::KItemTypeProperty );
+	CMdEPropertyDef& titleDef = tagObjectDef.GetPropertyDefL(
+		Object::KTitleProperty );
+	
+	// Set propertys.
+	TTime universalTime;
+    universalTime.UniversalTime(); 
+
+    // Creation time.
+	tagObject->AddTimePropertyL( creationDef, universalTime );   
+
+    // Modification time.
+	tagObject->AddTimePropertyL( modifiedDef, universalTime );
+
+    // Size 
+	tagObject->AddUint32PropertyL( sizeDef, aTagType); 
+	
+	// ItemType.
+	tagObject->AddTextPropertyL( itemTypeDef, Tag::KTagItemType );
+	
+	// Title, for country.
+	if ( aTitle.Length() > 0 )
+	    {
+	    tagObject->AddTextPropertyL( titleDef, aTitle ); // Add title
+	    }
+	
+	// Finally add to database.
+	TItemId itemId = iMdeSession->AddObjectL( *tagObject );
+    
+    CleanupStack::PopAndDestroy( tagObject );
+    
+    LOG( "CTagCreator::CreateTagL - end" );
+    
+    return itemId;
+    }
+
+// ---------------------------------------------------------------------------
+// CTagCreator::TagExistsL 
+// ---------------------------------------------------------------------------
+//
+TUint32 CTagCreator::TagExistsL( const TPtrC& aUri  )
+    {
+    LOG( "CTagCreator::TagExistsL - begin" );
+  
+    CMdEObject* mdeObject = NULL;
+    mdeObject = iMdeSession->GetObjectL( aUri ) ; // Just to find out if it exists.
+    
+    if( mdeObject )
+        {
+        LOG( "CTagCreator::TagExistsL - returning object id" );
+        return mdeObject->Id();
+        }
+    else
+        {
+        LOG( "CTagCreator::TagExistsL - No object, return 0" );
+        return 0;
+        } 
+    }
+    
+// ---------------------------------------------------------------------------
+// CGeoTagger::AttachTagsL 
+// Create relationship to country and city tag
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void CTagCreator::AttachTagsL( const TUint32 aObjectId, const TItemId aCountryTagId, 
+                             const TItemId aCityTagId )
+    {
+    LOG( "CGeoTagger::AttachTagsL" );
+    CMdENamespaceDef& defaultNamespace = iMdeSession->GetDefaultNamespaceDefL();
+    // contains relation definition
+    CMdERelationDef& containsRelDef = defaultNamespace.GetRelationDefL(
+        Relations::KContains );
+    
+    // Create relation between country tag and media object (image/video).
+    CMdERelation* relationObject = NULL;
+    if ( aCountryTagId )
+        {
+        relationObject = iMdeSession->NewRelationLC ( containsRelDef,
+                aObjectId, aCountryTagId, 0 );
+        
+        if ( !relationObject )
+            {
+            LOG( "CGeoTagger::AttachTagsL - Couldn't create relation object!" );
+            User::Leave ( KErrBadHandle );
+            }
+        
+        iMdeSession->AddRelationL( *relationObject );
+            
+        CleanupStack::PopAndDestroy( relationObject );
+        } 
+    
+    // Create relation between city tag and media object (image/video). 
+    if ( aCityTagId )
+        {
+        relationObject = iMdeSession->NewRelationLC ( containsRelDef,
+                    aObjectId, aCityTagId, 0 );
+        
+        if ( !relationObject)
+            {
+            LOG( "CGeoTagger::AttachTagsL - Couldn't create relation object!" );
+            User::Leave ( KErrBadHandle );
+            }
+        
+        iMdeSession->AddRelationL( *relationObject );
+                
+        CleanupStack::PopAndDestroy( relationObject );
+        }      
+
+    LOG( "CGeoTagger::AttachTagsL - end" );
+    }
+
+// ---------------------------------------------------------------------------
+// CGeoTagger::CreateLocationTagsL 
+// Create country and city tags
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void CTagCreator::CreateLocationTagsL( const TPtrC& aCountry, TItemId& aCountryTagId, 
+                                               const TPtrC& aCity, TItemId& aCityTagId)
+	{        
+	LOG( "CGeoTagger::CreateLocationTagsL" );
+    if( aCountry.Length() > 0 )
+        {
+        CreateTagForCountryL( aCountry, aCountryTagId );
+        } 
+                             
+    if( aCity.Length() > 0 )
+        {
+        CreateTagForCityL( aCountry, aCity, aCityTagId );
+        }
+	} 
+   
+// End of file
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/content_listing_framework_collection_manager_api/tsrc/Bmarm/CollectionMangerTestU.DEF
--- a/mds_plat/content_listing_framework_collection_manager_api/tsrc/Bmarm/CollectionMangerTestU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-EXPORTS
-	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
\ No newline at end of file
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/content_listing_framework_collection_manager_api/tsrc/Bmarm/CollectionMangerTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/content_listing_framework_collection_manager_api/tsrc/Bmarm/CollectionMangerTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,2 @@
+EXPORTS
+	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
\ No newline at end of file
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/content_listing_framework_collection_manager_api/tsrc/Bwins/CollectionManagerTestU.DEF
--- a/mds_plat/content_listing_framework_collection_manager_api/tsrc/Bwins/CollectionManagerTestU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/content_listing_framework_collection_manager_api/tsrc/Bwins/CollectionManagerTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/content_listing_framework_collection_manager_api/tsrc/Bwins/CollectionManagerTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,2 @@
+EXPORTS
+	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/context_engine_plugin_api/tsrc/Bmarm/ContextEnginePluginTestU.DEF
--- a/mds_plat/context_engine_plugin_api/tsrc/Bmarm/ContextEnginePluginTestU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/context_engine_plugin_api/tsrc/Bmarm/ContextEnginePluginTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/context_engine_plugin_api/tsrc/Bmarm/ContextEnginePluginTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/context_engine_plugin_api/tsrc/Bwins/ContextEnginePluginTestU.DEF
--- a/mds_plat/context_engine_plugin_api/tsrc/Bwins/ContextEnginePluginTestU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/context_engine_plugin_api/tsrc/Bwins/ContextEnginePluginTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/context_engine_plugin_api/tsrc/Bwins/ContextEnginePluginTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/context_engine_plugin_api/tsrc/EABI/ContextEnginePluginTestU.def
--- a/mds_plat/context_engine_plugin_api/tsrc/EABI/ContextEnginePluginTestU.def	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/context_engine_plugin_api/tsrc/eabi/ContextEnginePluginTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/context_engine_plugin_api/tsrc/eabi/ContextEnginePluginTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/ComposerPluginTest/Bmarm/ComposerPluginTestU.DEF
--- a/mds_plat/harvester_framework_api/tsrc/ComposerPluginTest/Bmarm/ComposerPluginTestU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/ComposerPluginTest/Bmarm/ComposerPluginTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/harvester_framework_api/tsrc/ComposerPluginTest/Bmarm/ComposerPluginTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/ComposerPluginTest/Bwins/ComposerPluginTestU.DEF
--- a/mds_plat/harvester_framework_api/tsrc/ComposerPluginTest/Bwins/ComposerPluginTestU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/ComposerPluginTest/Bwins/ComposerPluginTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/harvester_framework_api/tsrc/ComposerPluginTest/Bwins/ComposerPluginTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/ComposerPluginTest/EABI/ComposerPluginTestU.def
--- a/mds_plat/harvester_framework_api/tsrc/ComposerPluginTest/EABI/ComposerPluginTestU.def	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/ComposerPluginTest/eabi/ComposerPluginTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/harvester_framework_api/tsrc/ComposerPluginTest/eabi/ComposerPluginTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterClientTest/Bmarm/HarvesterClientTestScripterU.DEF
--- a/mds_plat/harvester_framework_api/tsrc/HarvesterClientTest/Bmarm/HarvesterClientTestScripterU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterClientTest/Bmarm/HarvesterClientTestScripteru.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/harvester_framework_api/tsrc/HarvesterClientTest/Bmarm/HarvesterClientTestScripteru.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterClientTest/Bwins/HarvesterClientTestScripterU.DEF
--- a/mds_plat/harvester_framework_api/tsrc/HarvesterClientTest/Bwins/HarvesterClientTestScripterU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterClientTest/Bwins/HarvesterClientTestScripteru.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/harvester_framework_api/tsrc/HarvesterClientTest/Bwins/HarvesterClientTestScripteru.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterClientTest/EABI/HarvesterClientTestScripterU.def
--- a/mds_plat/harvester_framework_api/tsrc/HarvesterClientTest/EABI/HarvesterClientTestScripterU.def	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterClientTest/eabi/HarvesterClientTestScripteru.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/harvester_framework_api/tsrc/HarvesterClientTest/eabi/HarvesterClientTestScripteru.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterDataTest/Bmarm/HarvesterDataTestU.DEF
--- a/mds_plat/harvester_framework_api/tsrc/HarvesterDataTest/Bmarm/HarvesterDataTestU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterDataTest/Bmarm/HarvesterDataTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/harvester_framework_api/tsrc/HarvesterDataTest/Bmarm/HarvesterDataTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterDataTest/Bwins/HarvesterDataTestU.DEF
--- a/mds_plat/harvester_framework_api/tsrc/HarvesterDataTest/Bwins/HarvesterDataTestU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterDataTest/Bwins/HarvesterDataTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/harvester_framework_api/tsrc/HarvesterDataTest/Bwins/HarvesterDataTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterDataTest/EABI/HarvesterDataTestU.def
--- a/mds_plat/harvester_framework_api/tsrc/HarvesterDataTest/EABI/HarvesterDataTestU.def	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterDataTest/eabi/HarvesterDataTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/harvester_framework_api/tsrc/HarvesterDataTest/eabi/HarvesterDataTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterPluginTest/Bmarm/HarvesterPluginTestU.DEF
--- a/mds_plat/harvester_framework_api/tsrc/HarvesterPluginTest/Bmarm/HarvesterPluginTestU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterPluginTest/Bmarm/HarvesterPluginTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/harvester_framework_api/tsrc/HarvesterPluginTest/Bmarm/HarvesterPluginTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterPluginTest/Bwins/HarvesterPluginTestU.DEF
--- a/mds_plat/harvester_framework_api/tsrc/HarvesterPluginTest/Bwins/HarvesterPluginTestU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterPluginTest/Bwins/HarvesterPluginTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/harvester_framework_api/tsrc/HarvesterPluginTest/Bwins/HarvesterPluginTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterPluginTest/EABI/HarvesterPluginTestU.def
--- a/mds_plat/harvester_framework_api/tsrc/HarvesterPluginTest/EABI/HarvesterPluginTestU.def	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-	_ZTI17CMdeObjectHandler @ 2 NONAME ; #<TI>#
-	_ZTV17CMdeObjectHandler @ 3 NONAME ; #<VT>#
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/HarvesterPluginTest/eabi/HarvesterPluginTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/harvester_framework_api/tsrc/HarvesterPluginTest/eabi/HarvesterPluginTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,5 @@
+EXPORTS
+	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
+	_ZTI17CMdeObjectHandler @ 2 NONAME ; #<TI>#
+	_ZTV17CMdeObjectHandler @ 3 NONAME ; #<VT>#
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/MonitorPluginTest/Bmarm/MonitorPluginTestU.DEF
--- a/mds_plat/harvester_framework_api/tsrc/MonitorPluginTest/Bmarm/MonitorPluginTestU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/MonitorPluginTest/Bmarm/MonitorPluginTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/harvester_framework_api/tsrc/MonitorPluginTest/Bmarm/MonitorPluginTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/MonitorPluginTest/Bwins/MonitorPluginTestU.DEF
--- a/mds_plat/harvester_framework_api/tsrc/MonitorPluginTest/Bwins/MonitorPluginTestU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/MonitorPluginTest/Bwins/MonitorPluginTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/harvester_framework_api/tsrc/MonitorPluginTest/Bwins/MonitorPluginTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/MonitorPluginTest/EABI/MonitorPluginTestU.def
--- a/mds_plat/harvester_framework_api/tsrc/MonitorPluginTest/EABI/MonitorPluginTestU.def	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/MonitorPluginTest/eabi/MonitorPluginTestu.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/harvester_framework_api/tsrc/MonitorPluginTest/eabi/MonitorPluginTestu.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/harvester_framework_api/tsrc/data/mmc/HarvesterTest/corrupt.jpg
--- a/mds_plat/harvester_framework_api/tsrc/data/mmc/HarvesterTest/corrupt.jpg	Tue Jul 06 14:44:37 2010 +0300
+++ b/mds_plat/harvester_framework_api/tsrc/data/mmc/HarvesterTest/corrupt.jpg	Wed Jul 14 07:57:22 2010 +0300
@@ -1,94 +1,94 @@
-ZZZZ$Z$$$ZZ$$$$$77$777777777777777777777I77II7I?III?IIII???????+++????????++++++=++++++++++++++++++=++======+======+++++
-ZZZZZZZZ$$ZZ$77777777777III777777I7777IIIIIIIII??IIIIII???????++++???????++++++++++++?????++++++++++========+===~+=+++++
-ZZZZZZ$$$$$$77777$$77I77777777III77IIIIII7IIIII????II????I7$ZZZ$$7I???????++?+++++++++++++++++++++++==+=============++++
-$ZZ77$7$$$$$777777777777I7777IIII77I777III?III??????IDNNMNNNNNDDDNNNDDO7????+++++=++=++++++++=++++====+========~~===++++
-ZZ$$$7777$$$$$777777777777IIIIIIII7IIIIIIIIII?I??+IZNND8NNNMMMMNNNDDDNND8?+??+?++++++++++++++==+=+===++=======~~~====+++
-$$$$$$$$Z$$$$7777777777I7I?II??IIIIII?III???????$DMNN8O8NNNNNNNNMMMMND8DNMD$+++?++==++++++++=======~===========~~======+
-$$$$Z$$$$$$$7777I777IIIIII?IIIIIIIII?????+????ZNND8DDZZDDDDDDDNNNNNNMMMMNNNNNZ?++=====+++++++=====~~==~===~==~=~=~======
-$$$7$$$7$777III777IIIIIIIIIII??III??III???++?$MNNDDD8$O88DDDNMNNNNNNMMMMMMDNMMN7+=====+++++==========~~~~~~~~~~=~======+
-77777777777777IIIII7IIIII????????II?????++++$DN8Z7?+++=++???I$ODNNNMMMMMNNNNNMMM+=+===~==========~==~~~~~~~~~~~~=~======
-$$77777777777I77IIIIIIII????II?III?????++++I8N$I?+======++???I$O8DDNNNMMNNNMNMNMZ+=+==~===~~====~==~~~~~~~~~~~~~~~======
-$$77777777III77IIIIIIII??????I?I????+++++?I8NOI?=~~~~~~~~~==+?I7$ZDNNNNMMMMNNNMNMO+===~~===~~~~~~~~~~~~~~~~~~::~~=======
-$$$$$$77II77IIIIIIIIIII?????????????+++++7NM87+=~:~~:~~~~~~==++I7$8DNNNMNMMMMMNMNMO=~=======~~~~~~~:~~~~~~:::::::~~=====
-77777$$7IIII?II??II??????????++++??++===$NMNZI+=~~~~~~~~~~~==+?I7$OO8DNMNNNMNNMMNMM$==+++===~===~~~~~~~~:::::::::~~~====
-7II?I7I77III???+????++???????++????+==~+$DMD$I+=======~=====+???I7$ZO8DDNNMMNNMMMMMD???+++++++==~=~~~~=~~~~~:::::~~~==+=
-777I777$7II???????++++??????+++???++==+IONM8$I+============+++??II7$ZZODNNNMMMMMMMMM7?I??????+=====~~~~~~~~~~::::~~~===+
-$7777$$ZZ7I7I??++?I?++?++???+++++++===7$DNNO7I++===~~=======++++++?I7$Z8NNNNNMNMNMMM8I7IIII7I+=====~+=~~::::~~~::~~~===+
-ZZZOOZ8OO$7III?II77I?+++++++++=====+=?78DMMZI?=+===~=~=~==++=+++???II7Z8NMMMMMMMNMNMD7$$$I77I????+++?=~~~~~~~::::::~==++
-O8888ZZZ88Z$$$$7777$7?I7?++=+=++====+7$8NMMOI?????+=+===?7$7IIIII77$ZZODNNMMMMMMNNMNN$OZ$7IIII?I??++?+?+=~~:~~:::::===++
-O8DD8OOOOOOOZ$$$$$Z$$$Z$7I++++++====?$Z8MMM87?I77$I++++?$ZOZZZZOZ$OOOOO8NNMMMMMMNNNMMOZ$ZZ$$777I??+??+?+=~~:~~~::::~====
-DDDD88OOOZZZZOOOZZOOOOZ$ZZ7+?+=++=++IOO8DNMDDDI777$ZI+?ZDDZ7$OOO8DMNO$ZODMMMNNNNMMMNMDOZZZZZ$III?I7$7I??=~~~~~~~:~==++++
-888888888OOOO8OZO8OOOZO$7$Z+?+=+++??IZDNNMMOZDIZNDO7I=I8O$I?IOZZZZ???I7O8MMNNMMMMMMMMNOOZZZZZ7$$$77$77I++~:::::~:~====+?
-DD8D8O8OOO888OOOZ8D8O88ZZ8+???IZO$???ONNMMMZIIII$Z7?+=7ZZ7??I77$7I++?I7ODMMMMMMMMNNNMMO8OOOZ$7$$$77$777I?=~~~~~~~===+++?
-8D88OO88OOO8888OODD888OOO8OZ7$OO$8Z7ZO8NMMN7?+=====+?+I77I?=~~~~~=??I7Z8DMMMMNMMMMMNNMZZZZZ$$777$$$Z$$$7I+==~==~=====++?
-8DDDO88888888DDD8DD88DD8O888OZOZ$DO$OO8NMMM$?+====++++?II?+==~~~==?I7$Z8NMMMMNMMMMNNNMZZZZZZ$$Z$$$$ZZZ$7I?==========++??
-DD888D8OO8DDD8ODNDD88DDD8D8D8O8OODOO88DNNMM8I+=~==+++=?II?++====++I7$ZODNMMMNMMNMMNNNM77777I??I???????????++++++???????I
-NMMNNNNNDDDND8D88DD8DDDDDD8DD8D8D8DNNNNNNMMD7+++==++++II7I?++==++?7$ZO8NNMMMNNNMMMMMNN88OOOOO$$$$$$$7I??I???++??III7$$7I
-NMMNDDNNNDDDD88O88888D8DN8DDDDDDNNNMMNNNMMMMZ7++??I?=?777ZI++=+??I$ZOODNNMMMMMMMMMMMMNDD8O8OOOZZZZZZZ$ZZ$7I7777I7I7$$ZZZ
-NNNNNDDNNDDDNDNDD888DD88DDDDDDDDDNNNNNMMMMMMD$II?++?$8NMND7++??II7ZO88DNMMMMMMMMMMMMMMNDDD888OOOOOO8OZ$Z$$$ZZZ$$$$$$$$ZZ
-MMNMNDDNNNDDNDDDNDD8DD888D88DDDDNNNMNNNMMMMMNZ7II?==?NNN8ZI??III7$$ZO8DNMMMMMMMMMMMMMMN8OOOOOOOOZOOOZOZZZZOZZZZ$$$$$$ZZ$
-NNNMMNNDDNDDNDDDNND8DDDDDD88DDDDDNDNMMMMNMMMMO7I77?++I7$$77Z7IIII7ZZO8DNNMMMMMMMMMMMMNND888ZOOOZZZOOOOZZZZ$$77777$$ZZOO8
-MNNMNDDDNNNNNDDDDDD8DDNDDDDDDNNDNDDDNMMMNNMMMN7II7I?77$ZOOZ7I??II7ZO8DNNNMMMNNMMMMMMMNNN8OOZOZZZZZZZZZZZZ$$$$$$$$$$ZOOOO
-NMMNDNNNNNDDDDDDDNNNNNMNDDDNDNNDD88DNNNNMMMMMMO7I?++IZZZZZ$77II7$$O8DDNNMMMMMMMMMMMMMNND8OOOOZZZOOZZZZZZZZZZZZZOOOZZZZZO
-NMMNDNNNNNNDNDDDDNDNNNNNNNNDDDDDD88DNNMMMMMMMMNO$II??$$Z$77$777$ZZ8DDDNNMMMMMMMMMMMMMMDD8ZOO8OZZZ$ZZOOOOZZZZOOOOOOZOOZ$Z
-NMMNNNNNNNNNNNNNDNNDDDDDD8D88D8D88O8NDDNMMMMMMMMNO7?+===?I777$ZO88DDDNMMMMMMMMMMMMMMMMND8O$ZZZ$$$$$ZOZOOZZZ$$$Z$$ZZ$ZOZZ
-MNNMNNMNNNNNNNNNNNNNNNDDD888888888O8NNNMNNNMMNMMMMNOI++?I77$O88DDDDNNMMMMMMMMMMMMMMMMNNNDOZZZZ$$$$$$ZZZZOZ$$ZZOOO$$ZOZZO
-NNMMMNMMMDDNNNNNNNNNDNNDDDDD88O8OOZ$8NNNMMMMMMMMMMMMNZZOO88DDDDDDNMMMNNNMMMNMMMMMMMMNMNNDZOZO8ZOOZZZOOZO8O8OOOOO8OZZZZ$$
-MMMNNNMMNNNDNDNNNNNNNDNNDDDDDD88OZZ$OMNMMMMMMMMMMMMMMMMMMMNNNMMMMMNNNNNNNNNMMMMMMMMMMNNNND88O8OOOOOZOOOO8OZO888888OZZZO8
-NMNNNMNMMMNDNNNNNNNND88DOO8OOZOOZZZ$ZDNMMMMMMMMMMMMMMMMNNMMMMMMNNNNNNDNDDNNMMMNMMMMMMNMMND88OOZZZZZ$OOO88OO8888O8O888OOO
-MMMMMMMNMNNNNDDDDDDD8888D8OZZZZZZOZZO8NMMMMMMMMMMMMMMMN$ZO88DNNNDDD88OOO8DNNMMNMMMMNNNNNN8O8O8OOOO8OOOO8OZZZO88OOZOZZZO8
-MMMMMMMMMMNDNNNDD888OOO8OZ8OOOZOZZZZOOONMMNNMMMMMMMMMMMZI7$$OOO888OOZZZZZ8DNMNNNMMMMNNNMMDD8Z$77II7$77$$$$$$$77$7I??7$ZZ
-NNMMMMMMMNDDND88D888O8OO8O88OOOOOOOO888NMMMNMMMMMMMMMMMD7II77$ZZZZZZ$$77$Z8NNDNMNNMNDNNMMMN8DD8O8O8OZZ7I77Z$77777$$ZOZ7$
-NNNNNNNNNNNND88DNNDDNNNNNOOOOOOOZOZONDDMMMMMMMMMMMMMMMN8$7III777$$777I7I7$Z8NNNNNNNN88MMMMMNMND888DNZOO8DNZ77II777ZZ$7$O
-NNNNNNDNDDD88888D8DNNNNNMDD8O8DD8DNDNNMMMMMMMMMMMMMMMDOZ$7II?I7777IIIII?7$$ODNDDDDDN88MNNMMNNND8OO8NODD8DN8O7II77$Z$$7$O
-NNNNNNNNDDDDD888D8NDDDO8NMNMNNNMNNMMNNNMMMMMMMMMMMNDO7I?I????????I?++????I7Z8DDNN88N8DMNMNNMNDDNNNND88ZZOOZZ7II?IZ$ZZ7$$
-NNNNNNNNNDDDD8DDNNDDDND8NMMMMMMNMNNMMMMMMMMNMMMNNZ$$7???++?+????+++++++++?I$O8NDDZ8D8DNNNNMMNDD8OZZZ7III???III7ZZ$ZOZZZ8
-MMNDDNMMNNND8DNDNNNDD8DDNMNDNMMMMNMMMMMMMMMMMM8$7I???=++=++++++++==+==+++I7ZDDDDOZ8D8NNNNNNNNMND8888O7+?I?7$$77$$$$ZOOOO
-NMMNNNNMNNNDDDNDDDD8888NMMNDNMMMMMMMMMMMMMMMMMZIII++++++==+=+++++==+++????7Z888DOZ8DDNNNNNNNNMNND88D8$?IIII777$$Z$$$Z$$$
-NNNNNNMNNDDDNDDD8O8O8DDNMNNNNMMMMNNNMMMMMMMNNN7I?+++========++========++??I$8OO88O8DNMNNNNMDDNNMNDDDOO$I$7I??II??I777777
-NNNMNNNND8DDD8DDO8D8DNDNDDNNDDNMNNNMMMMMMMNNNOI+++++=~~=====+====~=====+?I$$8DO88O8NNMNNNDD88DDDNNNN8OO8Z$77Z7?7O777$O$$
-NDNNNDNNND8888O8OO8O8DDDNNDDDNNDNNMMMMMMNDDDO$?+==============~====+++++?I$8O888888MMMNN8ZZZ88DDNMMNND8Z$$IIIIII?IIII???
-NNNMNDMMNM8Z8$ZOOO8OODDDDD888DNNMMMMMMMM8OZZO7++======~~~=======~~==++?+?I$ZOO8D88DND888OZOZ7ZZZO8DNMMMND88888Z77777I?I?
-NNNNNDMMNMDDN$ZOZZOOZO88DN888DMMMMMMMMMMOZZ$$?=+===========~=====~===+++?I$ZOO8DDD8OOZ$$$7$$$8DDDDNMNNMMMD8O88OZ$$$OO77$
-NNNNNNMMNNNDNMN8OZZO88O8D88DNMMMMMMMMMMNZ7II?+==========~======~=~===++??7ZOO888O$7$$$$I?IIII$O8DNMMMMMMMMNDD8ODD88888DO
-DDNNDDNDDNNNNNNDNDOOOOOOO88MMMMMMMMMMMN8$III+===~=========~~=~~~==~==++?I$$ZZZZOOOZ7I?7$O888DNNNNNNMMMMMMMMNNDD88DNNDO$I
-NNNNDDDNNNDNNNNNN88DDD8OZ$MMMMMMMMMMMMND7?++=======+===~~~~~~~~=~~~~~=+??7$$ZOO$7$ZO8DDNNNMMMMMMMMMMMMMMMMMMMD88DDD8888D
-DNNNNNNNDDDDDNDDDDD888OZ$8MMMMMMMMMMMNDD87?++=~~=++++=~~~~~~~:~~~~~~===+?7ZZ$ZZODNNMNNDDNNNNMMMMMMMMMMMMMMMMMNMD8888DND8
-DNNNNNNNNND88D8888OZ$ZZZ8NMMMMMMMMMMNNDDDO$I?+===+?++==~~~~~~~~~~~~====?7$ZOO8DDNNNNDDMMMMMMMMMMMMMMMMMMMMMNNNMN888888D8
-NNDDND888OOO888OOOOO88DMMMMMMMMMMMMMNDD8DOOOD87I?I?+=~~~~~~=~~~~~===+I$ZOO8DNNMNNNNMMMMMMMMNMMMMMMMMMMMMMMMNMNMNDOOZOZO8
-NDND888O8888DO888DDDDMMMMMMMMMMMMMMNND88D8DD8888DDD8O7III?++=+==++I$$Z88ODMMNNNMMMMNNMNDNNNNMMMMMMMMMNMMMMMMMNNMMOOOZZ88
-NDDD8D8O8DDDD88888D8MMMMMMMMMMMMMMNDDDDDNNNDD8D8888OOOOOOOOO8OO8OZO8OODMD8NMMMMMMMMNNN8NNNNNMMMMMMMMMMMMMMMMMMMNMDDNDNDD
-NNDDDDDD8888OOZOOZZZMMMMMMMMMMMMMNDNDNNDMMD8DD8O8OO8D888888D888888ODMMNDNMNMMMMMMNNNN8NMNNNNMMMMMMMMMMMMMMMMMMMMNNDDDDD8
-MMNDDD888888O8OOOZ$$MMMMMMMMMMMMMNDDNNNDMMDDDNDD8OOO88888D8DDD8DD8DNNNNMMMMMMMMMNNNMD8NMDNNNMMNNDNNNMMMMMMMMMMMMNM8O88D8
-MMMNNNDDD8888888DDDDMMMMMMMMMMMMMNNNMNDNMNNMNMD8D88DDD88DND8NNNDDNDNMMMMMMMMMMMMNNNNDNNDDNN8OODNDDNDNNMMNMMMMNNNMMNOOO88
-MMMNNNNNNDNDDDDDD8DDMMMMMMMMMMMMMNNMMNMMMNMMMNDDDD8DD88NNMNMD8NNDNMMMMMMMMMMMMNNNMNNNMNND88O888NNNNNDNNMMMMMMMNMNNMDOZZZ
-MMMMMNNNNNNNNDDDDDDDMMMMMMMMMMMMMMMMMMMMNMMMMMNNNNNMNNNNMMMNNMNNMMMMMMMMMMMMMMMMMMMMMMDNND8O8D8N88DNNMMMMMMMNNNMMMMMNNND
-MMMMNNNDDNDNNDDDNNNMMMMMMMMMMMMMMMMMMMMMNMMMMNNNMNNMNNNNMNNNNNMNNMMMMMMMMMMMMMMMMMMMMNNNDDO888O888DNMMMMMMMMNNNNNMNMMMNN
-MMMNDD8D8888OOOO8DNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMNMMMMMNNNMNNNMMMMNMMMMMMMMMMMMMMMMNDND888888DNDNMMMNMMMMMMMNNNNNNMMD88
-MMD8888OOOO88OO88DNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNNNNMMMMMMMMMMMMMMMMMMMMMMNDDDDD8ODDDNMMMMMMMMMMMMMNNNDNMMMMN88
-MD8D888888OOOOOO8NMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNMMMMMMMMMMMMMMMMMMMMMMNNNDNND888DMMMNMMMMMMMMMMMMNNNNNNNNMDO
-88DDD88888OOO888MMNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMNNMMMMMMMMMMMMMMMMMMMMNMNNNNDDNNDNNNMMNMMMMMMMMMMMMMMNNNNNMNNMN8
-DDDDDDDDDD888DDNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMMMMMMMMMMMMMMMMNNNNDNNNNNMMMMMMMMMMMMMMMMMMMNNNNNNNMMNN
-NMMMMMMNNNNNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMMMMMMNMMMMMMMMMMMMNNNNMMMNNNN
-MMMNNMNNNNNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNMMNMMMMMMMMMMMMMMMMMMMMMMMNNNMMMMMMN
-NMMMMMNNNNMMMMMMMMMMMMMMMNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNMNNMMMMMMMMMMMMMMMMMMMMMMMMNNNNNNMMMN
-NMMMNNMMMMMMMMMMMMMMMMMMMNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMNNNMNNNMMMNNNM
-NNMMMMMMMMMMMMMMMMMMMMNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMNMMMMMMMMMMMMMMMNNMMNNMMMNNNN
-NMMMMMMMMMMMMMMMMMMMMMMMNNNMMMMMMMMMMMMMMMMMMMMMMMMMMNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMNMMMMMMNNN
-NMMMMMMMMMMMMMMMMNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNMMMNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMMMMMNMMNMMMMNN
-NMMNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNMMMMMMMMMMMMMMMNNMNN
-NMMMNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNMMMMMMMMMMMMMMMMMMMNN
-NMMMMMMMMMMMMMMNNMMMNDDDNMMMMMMMMNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNMMNMNNMNM
-MMMMMMMMMMMMMNNND88NMMMMNDDMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNNNNNMMMMNN
-NMMMMMMMMMMNNNNNDDMMDDDNNNNNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNMMMMMMMMMNMMNNNMNNNNNNNNN
-MMMMMMMMMMMMMMNNNMNODNND88NODD8DMNMND8OODDNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNNNNNNNMNNN
-NMMMMMMMMMMMMMDDNDOOMMND8N8DDODMN8O$III77$Z8DMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNNMNNNNNNMM
-NMMMMMMMMMMMMN8NDNNNNDONMNNO8MDZ8IIIIIII77$$$7ZODNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNMNNMNNN
-MMMMMMMMMMMMMNMDDMNMODMM8DNMMNOD$777IIII777777$$$$77$DMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNNNMMNNMNN
-NMMMMMMMMMMMMNDNMNN8MMMNMNMNMD88$$777777777777777$$77$$8NMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNNNMMMNNNNN
-NMMMMMMMMMMMMMMMMMDNNMMNMDMNMNNDZ$$$$$$$$7777777777$$$$$ZZZZNMMMMMMNNMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMMMMMMMMMNNNMNNNNNNN
-NMMMMMMMMMMMMMMMMNNNMMNNNDMMNNM8ZZZZZ$$Z$$777777$$77$$$$77$$Z8NMMMMMNMMMMMMMMMMMMMMMMMMMMMMNMMNMMMMMMMMNMMMMNNNNNNNNMMNN
-NNNMMMMMMMMMMMMMMMMMMMNMMMMMNNMND8888OOZZ$$$$$$7777777777777$$ZO88MNMNMMMMMMMMNNNDD8O8NNMMNNNMMMNMMMMMMNNMNNMNNNNNNNNNNN
-NMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMDDNDD88ZZZ$$$$$7$$$$77$ZZ$7III$8NDNNMN8ZO8O88NMND888NNND8O88NNMMMMMMMMNMMNNNNNNNNNNNNNN
-NNNNMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMMMNN8ZZZZZ$$$$Z$$$$$ZODD8777$7$D88D8OZZO8DD8O88DND88DNNNNNNNMMMMMMMMMMMNMMNMNNNMMMNNN
+ZZZZ$Z$$$ZZ$$$$$77$777777777777777777777I77II7I?III?IIII???????+++????????++++++=++++++++++++++++++=++======+======+++++
+ZZZZZZZZ$$ZZ$77777777777III777777I7777IIIIIIIII??IIIIII???????++++???????++++++++++++?????++++++++++========+===~+=+++++
+ZZZZZZ$$$$$$77777$$77I77777777III77IIIIII7IIIII????II????I7$ZZZ$$7I???????++?+++++++++++++++++++++++==+=============++++
+$ZZ77$7$$$$$777777777777I7777IIII77I777III?III??????IDNNMNNNNNDDDNNNDDO7????+++++=++=++++++++=++++====+========~~===++++
+ZZ$$$7777$$$$$777777777777IIIIIIII7IIIIIIIIII?I??+IZNND8NNNMMMMNNNDDDNND8?+??+?++++++++++++++==+=+===++=======~~~====+++
+$$$$$$$$Z$$$$7777777777I7I?II??IIIIII?III???????$DMNN8O8NNNNNNNNMMMMND8DNMD$+++?++==++++++++=======~===========~~======+
+$$$$Z$$$$$$$7777I777IIIIII?IIIIIIIII?????+????ZNND8DDZZDDDDDDDNNNNNNMMMMNNNNNZ?++=====+++++++=====~~==~===~==~=~=~======
+$$$7$$$7$777III777IIIIIIIIIII??III??III???++?$MNNDDD8$O88DDDNMNNNNNNMMMMMMDNMMN7+=====+++++==========~~~~~~~~~~=~======+
+77777777777777IIIII7IIIII????????II?????++++$DN8Z7?+++=++???I$ODNNNMMMMMNNNNNMMM+=+===~==========~==~~~~~~~~~~~~=~======
+$$77777777777I77IIIIIIII????II?III?????++++I8N$I?+======++???I$O8DDNNNMMNNNMNMNMZ+=+==~===~~====~==~~~~~~~~~~~~~~~======
+$$77777777III77IIIIIIII??????I?I????+++++?I8NOI?=~~~~~~~~~==+?I7$ZDNNNNMMMMNNNMNMO+===~~===~~~~~~~~~~~~~~~~~~::~~=======
+$$$$$$77II77IIIIIIIIIII?????????????+++++7NM87+=~:~~:~~~~~~==++I7$8DNNNMNMMMMMNMNMO=~=======~~~~~~~:~~~~~~:::::::~~=====
+77777$$7IIII?II??II??????????++++??++===$NMNZI+=~~~~~~~~~~~==+?I7$OO8DNMNNNMNNMMNMM$==+++===~===~~~~~~~~:::::::::~~~====
+7II?I7I77III???+????++???????++????+==~+$DMD$I+=======~=====+???I7$ZO8DDNNMMNNMMMMMD???+++++++==~=~~~~=~~~~~:::::~~~==+=
+777I777$7II???????++++??????+++???++==+IONM8$I+============+++??II7$ZZODNNNMMMMMMMMM7?I??????+=====~~~~~~~~~~::::~~~===+
+$7777$$ZZ7I7I??++?I?++?++???+++++++===7$DNNO7I++===~~=======++++++?I7$Z8NNNNNMNMNMMM8I7IIII7I+=====~+=~~::::~~~::~~~===+
+ZZZOOZ8OO$7III?II77I?+++++++++=====+=?78DMMZI?=+===~=~=~==++=+++???II7Z8NMMMMMMMNMNMD7$$$I77I????+++?=~~~~~~~::::::~==++
+O8888ZZZ88Z$$$$7777$7?I7?++=+=++====+7$8NMMOI?????+=+===?7$7IIIII77$ZZODNNMMMMMMNNMNN$OZ$7IIII?I??++?+?+=~~:~~:::::===++
+O8DD8OOOOOOOZ$$$$$Z$$$Z$7I++++++====?$Z8MMM87?I77$I++++?$ZOZZZZOZ$OOOOO8NNMMMMMMNNNMMOZ$ZZ$$777I??+??+?+=~~:~~~::::~====
+DDDD88OOOZZZZOOOZZOOOOZ$ZZ7+?+=++=++IOO8DNMDDDI777$ZI+?ZDDZ7$OOO8DMNO$ZODMMMNNNNMMMNMDOZZZZZ$III?I7$7I??=~~~~~~~:~==++++
+888888888OOOO8OZO8OOOZO$7$Z+?+=+++??IZDNNMMOZDIZNDO7I=I8O$I?IOZZZZ???I7O8MMNNMMMMMMMMNOOZZZZZ7$$$77$77I++~:::::~:~====+?
+DD8D8O8OOO888OOOZ8D8O88ZZ8+???IZO$???ONNMMMZIIII$Z7?+=7ZZ7??I77$7I++?I7ODMMMMMMMMNNNMMO8OOOZ$7$$$77$777I?=~~~~~~~===+++?
+8D88OO88OOO8888OODD888OOO8OZ7$OO$8Z7ZO8NMMN7?+=====+?+I77I?=~~~~~=??I7Z8DMMMMNMMMMMNNMZZZZZ$$777$$$Z$$$7I+==~==~=====++?
+8DDDO88888888DDD8DD88DD8O888OZOZ$DO$OO8NMMM$?+====++++?II?+==~~~==?I7$Z8NMMMMNMMMMNNNMZZZZZZ$$Z$$$$ZZZ$7I?==========++??
+DD888D8OO8DDD8ODNDD88DDD8D8D8O8OODOO88DNNMM8I+=~==+++=?II?++====++I7$ZODNMMMNMMNMMNNNM77777I??I???????????++++++???????I
+NMMNNNNNDDDND8D88DD8DDDDDD8DD8D8D8DNNNNNNMMD7+++==++++II7I?++==++?7$ZO8NNMMMNNNMMMMMNN88OOOOO$$$$$$$7I??I???++??III7$$7I
+NMMNDDNNNDDDD88O88888D8DN8DDDDDDNNNMMNNNMMMMZ7++??I?=?777ZI++=+??I$ZOODNNMMMMMMMMMMMMNDD8O8OOOZZZZZZZ$ZZ$7I7777I7I7$$ZZZ
+NNNNNDDNNDDDNDNDD888DD88DDDDDDDDDNNNNNMMMMMMD$II?++?$8NMND7++??II7ZO88DNMMMMMMMMMMMMMMNDDD888OOOOOO8OZ$Z$$$ZZZ$$$$$$$$ZZ
+MMNMNDDNNNDDNDDDNDD8DD888D88DDDDNNNMNNNMMMMMNZ7II?==?NNN8ZI??III7$$ZO8DNMMMMMMMMMMMMMMN8OOOOOOOOZOOOZOZZZZOZZZZ$$$$$$ZZ$
+NNNMMNNDDNDDNDDDNND8DDDDDD88DDDDDNDNMMMMNMMMMO7I77?++I7$$77Z7IIII7ZZO8DNNMMMMMMMMMMMMNND888ZOOOZZZOOOOZZZZ$$77777$$ZZOO8
+MNNMNDDDNNNNNDDDDDD8DDNDDDDDDNNDNDDDNMMMNNMMMN7II7I?77$ZOOZ7I??II7ZO8DNNNMMMNNMMMMMMMNNN8OOZOZZZZZZZZZZZZ$$$$$$$$$$ZOOOO
+NMMNDNNNNNDDDDDDDNNNNNMNDDDNDNNDD88DNNNNMMMMMMO7I?++IZZZZZ$77II7$$O8DDNNMMMMMMMMMMMMMNND8OOOOZZZOOZZZZZZZZZZZZZOOOZZZZZO
+NMMNDNNNNNNDNDDDDNDNNNNNNNNDDDDDD88DNNMMMMMMMMNO$II??$$Z$77$777$ZZ8DDDNNMMMMMMMMMMMMMMDD8ZOO8OZZZ$ZZOOOOZZZZOOOOOOZOOZ$Z
+NMMNNNNNNNNNNNNNDNNDDDDDD8D88D8D88O8NDDNMMMMMMMMNO7?+===?I777$ZO88DDDNMMMMMMMMMMMMMMMMND8O$ZZZ$$$$$ZOZOOZZZ$$$Z$$ZZ$ZOZZ
+MNNMNNMNNNNNNNNNNNNNNNDDD888888888O8NNNMNNNMMNMMMMNOI++?I77$O88DDDDNNMMMMMMMMMMMMMMMMNNNDOZZZZ$$$$$$ZZZZOZ$$ZZOOO$$ZOZZO
+NNMMMNMMMDDNNNNNNNNNDNNDDDDD88O8OOZ$8NNNMMMMMMMMMMMMNZZOO88DDDDDDNMMMNNNMMMNMMMMMMMMNMNNDZOZO8ZOOZZZOOZO8O8OOOOO8OZZZZ$$
+MMMNNNMMNNNDNDNNNNNNNDNNDDDDDD88OZZ$OMNMMMMMMMMMMMMMMMMMMMNNNMMMMMNNNNNNNNNMMMMMMMMMMNNNND88O8OOOOOZOOOO8OZO888888OZZZO8
+NMNNNMNMMMNDNNNNNNNND88DOO8OOZOOZZZ$ZDNMMMMMMMMMMMMMMMMNNMMMMMMNNNNNNDNDDNNMMMNMMMMMMNMMND88OOZZZZZ$OOO88OO8888O8O888OOO
+MMMMMMMNMNNNNDDDDDDD8888D8OZZZZZZOZZO8NMMMMMMMMMMMMMMMN$ZO88DNNNDDD88OOO8DNNMMNMMMMNNNNNN8O8O8OOOO8OOOO8OZZZO88OOZOZZZO8
+MMMMMMMMMMNDNNNDD888OOO8OZ8OOOZOZZZZOOONMMNNMMMMMMMMMMMZI7$$OOO888OOZZZZZ8DNMNNNMMMMNNNMMDD8Z$77II7$77$$$$$$$77$7I??7$ZZ
+NNMMMMMMMNDDND88D888O8OO8O88OOOOOOOO888NMMMNMMMMMMMMMMMD7II77$ZZZZZZ$$77$Z8NNDNMNNMNDNNMMMN8DD8O8O8OZZ7I77Z$77777$$ZOZ7$
+NNNNNNNNNNNND88DNNDDNNNNNOOOOOOOZOZONDDMMMMMMMMMMMMMMMN8$7III777$$777I7I7$Z8NNNNNNNN88MMMMMNMND888DNZOO8DNZ77II777ZZ$7$O
+NNNNNNDNDDD88888D8DNNNNNMDD8O8DD8DNDNNMMMMMMMMMMMMMMMDOZ$7II?I7777IIIII?7$$ODNDDDDDN88MNNMMNNND8OO8NODD8DN8O7II77$Z$$7$O
+NNNNNNNNDDDDD888D8NDDDO8NMNMNNNMNNMMNNNMMMMMMMMMMMNDO7I?I????????I?++????I7Z8DDNN88N8DMNMNNMNDDNNNND88ZZOOZZ7II?IZ$ZZ7$$
+NNNNNNNNNDDDD8DDNNDDDND8NMMMMMMNMNNMMMMMMMMNMMMNNZ$$7???++?+????+++++++++?I$O8NDDZ8D8DNNNNMMNDD8OZZZ7III???III7ZZ$ZOZZZ8
+MMNDDNMMNNND8DNDNNNDD8DDNMNDNMMMMNMMMMMMMMMMMM8$7I???=++=++++++++==+==+++I7ZDDDDOZ8D8NNNNNNNNMND8888O7+?I?7$$77$$$$ZOOOO
+NMMNNNNMNNNDDDNDDDD8888NMMNDNMMMMMMMMMMMMMMMMMZIII++++++==+=+++++==+++????7Z888DOZ8DDNNNNNNNNMNND88D8$?IIII777$$Z$$$Z$$$
+NNNNNNMNNDDDNDDD8O8O8DDNMNNNNMMMMNNNMMMMMMMNNN7I?+++========++========++??I$8OO88O8DNMNNNNMDDNNMNDDDOO$I$7I??II??I777777
+NNNMNNNND8DDD8DDO8D8DNDNDDNNDDNMNNNMMMMMMMNNNOI+++++=~~=====+====~=====+?I$$8DO88O8NNMNNNDD88DDDNNNN8OO8Z$77Z7?7O777$O$$
+NDNNNDNNND8888O8OO8O8DDDNNDDDNNDNNMMMMMMNDDDO$?+==============~====+++++?I$8O888888MMMNN8ZZZ88DDNMMNND8Z$$IIIIII?IIII???
+NNNMNDMMNM8Z8$ZOOO8OODDDDD888DNNMMMMMMMM8OZZO7++======~~~=======~~==++?+?I$ZOO8D88DND888OZOZ7ZZZO8DNMMMND88888Z77777I?I?
+NNNNNDMMNMDDN$ZOZZOOZO88DN888DMMMMMMMMMMOZZ$$?=+===========~=====~===+++?I$ZOO8DDD8OOZ$$$7$$$8DDDDNMNNMMMD8O88OZ$$$OO77$
+NNNNNNMMNNNDNMN8OZZO88O8D88DNMMMMMMMMMMNZ7II?+==========~======~=~===++??7ZOO888O$7$$$$I?IIII$O8DNMMMMMMMMNDD8ODD88888DO
+DDNNDDNDDNNNNNNDNDOOOOOOO88MMMMMMMMMMMN8$III+===~=========~~=~~~==~==++?I$$ZZZZOOOZ7I?7$O888DNNNNNNMMMMMMMMNNDD88DNNDO$I
+NNNNDDDNNNDNNNNNN88DDD8OZ$MMMMMMMMMMMMND7?++=======+===~~~~~~~~=~~~~~=+??7$$ZOO$7$ZO8DDNNNMMMMMMMMMMMMMMMMMMMD88DDD8888D
+DNNNNNNNDDDDDNDDDDD888OZ$8MMMMMMMMMMMNDD87?++=~~=++++=~~~~~~~:~~~~~~===+?7ZZ$ZZODNNMNNDDNNNNMMMMMMMMMMMMMMMMMNMD8888DND8
+DNNNNNNNNND88D8888OZ$ZZZ8NMMMMMMMMMMNNDDDO$I?+===+?++==~~~~~~~~~~~~====?7$ZOO8DDNNNNDDMMMMMMMMMMMMMMMMMMMMMNNNMN888888D8
+NNDDND888OOO888OOOOO88DMMMMMMMMMMMMMNDD8DOOOD87I?I?+=~~~~~~=~~~~~===+I$ZOO8DNNMNNNNMMMMMMMMNMMMMMMMMMMMMMMMNMNMNDOOZOZO8
+NDND888O8888DO888DDDDMMMMMMMMMMMMMMNND88D8DD8888DDD8O7III?++=+==++I$$Z88ODMMNNNMMMMNNMNDNNNNMMMMMMMMMNMMMMMMMNNMMOOOZZ88
+NDDD8D8O8DDDD88888D8MMMMMMMMMMMMMMNDDDDDNNNDD8D8888OOOOOOOOO8OO8OZO8OODMD8NMMMMMMMMNNN8NNNNNMMMMMMMMMMMMMMMMMMMNMDDNDNDD
+NNDDDDDD8888OOZOOZZZMMMMMMMMMMMMMNDNDNNDMMD8DD8O8OO8D888888D888888ODMMNDNMNMMMMMMNNNN8NMNNNNMMMMMMMMMMMMMMMMMMMMNNDDDDD8
+MMNDDD888888O8OOOZ$$MMMMMMMMMMMMMNDDNNNDMMDDDNDD8OOO88888D8DDD8DD8DNNNNMMMMMMMMMNNNMD8NMDNNNMMNNDNNNMMMMMMMMMMMMNM8O88D8
+MMMNNNDDD8888888DDDDMMMMMMMMMMMMMNNNMNDNMNNMNMD8D88DDD88DND8NNNDDNDNMMMMMMMMMMMMNNNNDNNDDNN8OODNDDNDNNMMNMMMMNNNMMNOOO88
+MMMNNNNNNDNDDDDDD8DDMMMMMMMMMMMMMNNMMNMMMNMMMNDDDD8DD88NNMNMD8NNDNMMMMMMMMMMMMNNNMNNNMNND88O888NNNNNDNNMMMMMMMNMNNMDOZZZ
+MMMMMNNNNNNNNDDDDDDDMMMMMMMMMMMMMMMMMMMMNMMMMMNNNNNMNNNNMMMNNMNNMMMMMMMMMMMMMMMMMMMMMMDNND8O8D8N88DNNMMMMMMMNNNMMMMMNNND
+MMMMNNNDDNDNNDDDNNNMMMMMMMMMMMMMMMMMMMMMNMMMMNNNMNNMNNNNMNNNNNMNNMMMMMMMMMMMMMMMMMMMMNNNDDO888O888DNMMMMMMMMNNNNNMNMMMNN
+MMMNDD8D8888OOOO8DNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMNMMMMMNNNMNNNMMMMNMMMMMMMMMMMMMMMMNDND888888DNDNMMMNMMMMMMMNNNNNNMMD88
+MMD8888OOOO88OO88DNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNNNNMMMMMMMMMMMMMMMMMMMMMMNDDDDD8ODDDNMMMMMMMMMMMMMNNNDNMMMMN88
+MD8D888888OOOOOO8NMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNMMMMMMMMMMMMMMMMMMMMMMNNNDNND888DMMMNMMMMMMMMMMMMNNNNNNNNMDO
+88DDD88888OOO888MMNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMNNMMMMMMMMMMMMMMMMMMMMNMNNNNDDNNDNNNMMNMMMMMMMMMMMMMMNNNNNMNNMN8
+DDDDDDDDDD888DDNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMMMMMMMMMMMMMMMMNNNNDNNNNNMMMMMMMMMMMMMMMMMMMNNNNNNNMMNN
+NMMMMMMNNNNNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMMMMMMNMMMMMMMMMMMMNNNNMMMNNNN
+MMMNNMNNNNNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNMMNMMMMMMMMMMMMMMMMMMMMMMMNNNMMMMMMN
+NMMMMMNNNNMMMMMMMMMMMMMMMNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNMNNMMMMMMMMMMMMMMMMMMMMMMMMNNNNNNMMMN
+NMMMNNMMMMMMMMMMMMMMMMMMMNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMNNNMNNNMMMNNNM
+NNMMMMMMMMMMMMMMMMMMMMNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMNMMMMMMMMMMMMMMMNNMMNNMMMNNNN
+NMMMMMMMMMMMMMMMMMMMMMMMNNNMMMMMMMMMMMMMMMMMMMMMMMMMMNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMNMMMMMMNNN
+NMMMMMMMMMMMMMMMMNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNMMMNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMMMMMNMMNMMMMNN
+NMMNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNMMMMMMMMMMMMMMMNNMNN
+NMMMNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNMMMMMMMMMMMMMMMMMMMNN
+NMMMMMMMMMMMMMMNNMMMNDDDNMMMMMMMMNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNMMNMNNMNM
+MMMMMMMMMMMMMNNND88NMMMMNDDMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNNNNNMMMMNN
+NMMMMMMMMMMNNNNNDDMMDDDNNNNNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNMMMMMMMMMNMMNNNMNNNNNNNNN
+MMMMMMMMMMMMMMNNNMNODNND88NODD8DMNMND8OODDNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNNNNNNNMNNN
+NMMMMMMMMMMMMMDDNDOOMMND8N8DDODMN8O$III77$Z8DMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNNMNNNNNNMM
+NMMMMMMMMMMMMN8NDNNNNDONMNNO8MDZ8IIIIIII77$$$7ZODNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNMNNMNNN
+MMMMMMMMMMMMMNMDDMNMODMM8DNMMNOD$777IIII777777$$$$77$DMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNNNMMNNMNN
+NMMMMMMMMMMMMNDNMNN8MMMNMNMNMD88$$777777777777777$$77$$8NMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNNNMMMNNNNN
+NMMMMMMMMMMMMMMMMMDNNMMNMDMNMNNDZ$$$$$$$$7777777777$$$$$ZZZZNMMMMMMNNMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMMMMMMMMMNNNMNNNNNNN
+NMMMMMMMMMMMMMMMMNNNMMNNNDMMNNM8ZZZZZ$$Z$$777777$$77$$$$77$$Z8NMMMMMNMMMMMMMMMMMMMMMMMMMMMMNMMNMMMMMMMMNMMMMNNNNNNNNMMNN
+NNNMMMMMMMMMMMMMMMMMMMNMMMMMNNMND8888OOZZ$$$$$$7777777777777$$ZO88MNMNMMMMMMMMNNNDD8O8NNMMNNNMMMNMMMMMMNNMNNMNNNNNNNNNNN
+NMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMDDNDD88ZZZ$$$$$7$$$$77$ZZ$7III$8NDNNMN8ZO8O88NMND888NNND8O88NNMMMMMMMMNMMNNNNNNNNNNNNNN
+NNNNMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMMMNN8ZZZZZ$$$$Z$$$$$ZODD8777$7$D88D8OZZO8DD8O88DND88DNNNNNNNMMMMMMMMMMMNMMNMNNNMMMNNN
 NMNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMD888OOZZZZZ$$ZZZZ$$ZZ8NNOZ$$$$DDDDDNDOODDDDDDDDDDD8DNNDNNNNNMMMMMMMMMMMMMNNNNNNNMMNN
\ No newline at end of file
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/location_manager_api/tsrc/Bmarm/LocationManagerTestScripterU.DEF
--- a/mds_plat/location_manager_api/tsrc/Bmarm/LocationManagerTestScripterU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/location_manager_api/tsrc/Bmarm/LocationManagerTestScripteru.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/location_manager_api/tsrc/Bmarm/LocationManagerTestScripteru.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/location_manager_api/tsrc/Bwins/LocationManagerTestScripterU.DEF
--- a/mds_plat/location_manager_api/tsrc/Bwins/LocationManagerTestScripterU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/location_manager_api/tsrc/Bwins/LocationManagerTestScripteru.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/location_manager_api/tsrc/Bwins/LocationManagerTestScripteru.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/location_manager_api/tsrc/EABI/LocationManagerTestScripterU.def
--- a/mds_plat/location_manager_api/tsrc/EABI/LocationManagerTestScripterU.def	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/location_manager_api/tsrc/eabi/LocationManagerTestScripteru.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/location_manager_api/tsrc/eabi/LocationManagerTestScripteru.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/location_manager_api/tsrc/group/LocationManagerTestScripter.mmp
--- a/mds_plat/location_manager_api/tsrc/group/LocationManagerTestScripter.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/mds_plat/location_manager_api/tsrc/group/LocationManagerTestScripter.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -27,7 +27,7 @@
 CAPABILITY      ALL -TCB
 VENDORID        VID_DEFAULT
 
-DEFFILE         LocationManagerTestScripter.DEF
+DEFFILE         LocationManagerTestScripter.def
 
 #ifdef _LOC_REVERSEGEOCODE
 MACRO LOC_REVERSEGEOCODE
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/location_manager_api/tsrc/inc/LocationManagerTestScripter.h
--- a/mds_plat/location_manager_api/tsrc/inc/LocationManagerTestScripter.h	Tue Jul 06 14:44:37 2010 +0300
+++ b/mds_plat/location_manager_api/tsrc/inc/LocationManagerTestScripter.h	Wed Jul 14 07:57:22 2010 +0300
@@ -32,7 +32,7 @@
 #include "mdesession.h"
 
 #ifdef LOC_REVERSEGEOCODE
-#include "RLocationGeoTagger.h"
+#include "rlocationgeotagger.h"
 #endif //LOC_REVERSEGEOCODE
 
 // CONSTANTS
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/metadata_engine_api/tsrc/Bmarm/MdETestScripterU.DEF
--- a/mds_plat/metadata_engine_api/tsrc/Bmarm/MdETestScripterU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/metadata_engine_api/tsrc/Bmarm/MdETestScripteru.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/metadata_engine_api/tsrc/Bmarm/MdETestScripteru.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/metadata_engine_api/tsrc/Bwins/MdETestScripterU.DEF
--- a/mds_plat/metadata_engine_api/tsrc/Bwins/MdETestScripterU.DEF	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * LibEntryL(class CTestModuleIf &)
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/metadata_engine_api/tsrc/Bwins/MdETestScripteru.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/metadata_engine_api/tsrc/Bwins/MdETestScripteru.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * LibEntryL(class CTestModuleIf &)
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/metadata_engine_api/tsrc/EABI/MdETestScripterU.def
--- a/mds_plat/metadata_engine_api/tsrc/EABI/MdETestScripterU.def	Tue Jul 06 14:44:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/metadata_engine_api/tsrc/data/mmc/MDETestScripterSchema.mde
--- a/mds_plat/metadata_engine_api/tsrc/data/mmc/MDETestScripterSchema.mde	Tue Jul 06 14:44:37 2010 +0300
+++ b/mds_plat/metadata_engine_api/tsrc/data/mmc/MDETestScripterSchema.mde	Wed Jul 14 07:57:22 2010 +0300
@@ -1,3 +1,3 @@
-// TestSchema.mde
-
-namespace http://sw.nokia.com/MdE/TestSchema 0
+// TestSchema.mde
+
+namespace http://sw.nokia.com/MdE/TestSchema 0
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/metadata_engine_api/tsrc/data/mmc/MDETestScripterSchema2.mde
--- a/mds_plat/metadata_engine_api/tsrc/data/mmc/MDETestScripterSchema2.mde	Tue Jul 06 14:44:37 2010 +0300
+++ b/mds_plat/metadata_engine_api/tsrc/data/mmc/MDETestScripterSchema2.mde	Wed Jul 14 07:57:22 2010 +0300
@@ -1,18 +1,18 @@
-// TestSchema2.mde
-
-namespace http://sw.nokia.com/MdE/TestSchema2 0
-
-object http://sw.nokia.com/MdE/TestSchema2 TestObjectType Object 1
-property   TestPropertyBool               0    0        0    min   max
-property   TestPropertyInt8               1    0        1    min   max
-property   TestPropertyUint8              0    0        2    min   max
-property   TestPropertyInt16              1    0        3    min   max
-property   TestPropertyUint16             0    0        4    min   max
-property   TestPropertyInt32              1    0        5    min   max
-property   TestPropertyUint32             0    0        6    min   max
-property   TestPropertyInt64              1    0        7    min   max
-property   TestPropertyReal32             0    0        8    min   max
-property   TestPropertyReal64             1    0        9    min   max
-property   TestPropertyTime               0    0        10   min   20100629163021
-property   TestPropertyText               1    0        11   min   max
-
+// TestSchema2.mde
+
+namespace http://sw.nokia.com/MdE/TestSchema2 0
+
+object http://sw.nokia.com/MdE/TestSchema2 TestObjectType Object 1
+property   TestPropertyBool               0    0        0    min   max
+property   TestPropertyInt8               1    0        1    min   max
+property   TestPropertyUint8              0    0        2    min   max
+property   TestPropertyInt16              1    0        3    min   max
+property   TestPropertyUint16             0    0        4    min   max
+property   TestPropertyInt32              1    0        5    min   max
+property   TestPropertyUint32             0    0        6    min   max
+property   TestPropertyInt64              1    0        7    min   max
+property   TestPropertyReal32             0    0        8    min   max
+property   TestPropertyReal64             1    0        9    min   max
+property   TestPropertyTime               0    0        10   min   20100629163021
+property   TestPropertyText               1    0        11   min   max
+
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/metadata_engine_api/tsrc/data/mmc/MdETestScripterImportMetadata.mde
--- a/mds_plat/metadata_engine_api/tsrc/data/mmc/MdETestScripterImportMetadata.mde	Tue Jul 06 14:44:37 2010 +0300
+++ b/mds_plat/metadata_engine_api/tsrc/data/mmc/MdETestScripterImportMetadata.mde	Wed Jul 14 07:57:22 2010 +0300
@@ -1,134 +1,134 @@
-object http://sw.nokia.com/MdE Video "e:\testing\data\test2video1.3gp" 4184041685
-property Origin 0
-property Size 66192
-property TimeOffset 120
-property CreationDate 20071217163916
-property LastModifiedDate 20071217143916
-property ItemType "video/H263-2000"
-property Bitrate 23
-property Width 176
-property Height 144
-property Duration 21
-property ReleaseDate 20071217163916
-property CaptureDate 20071217163916
-property Framerate 7
-
-object http://sw.nokia.com/MdE Video "e:\testing\data\test2video2.mp4" 4184041685
-property Origin 0
-property Size 733064
-property TimeOffset 120
-property CreationDate 20071217163916
-property LastModifiedDate 20071217143916
-property Bitrate 288
-property Width 320
-property Height 240
-property Duration 20
-property ReleaseDate 20071217163916
-property CaptureDate 20071217163916
-property Framerate 14
-
-object http://sw.nokia.com/MdE Video "e:\testing\data\test3video1.3gp" 4184041685
-property Origin 0
-property Size 66192
-property TimeOffset 120
-property CreationDate 20071217163916
-property LastModifiedDate 20071217143916
-property ItemType "video/H263-2000"
-property Bitrate 23
-property Width 176
-property Height 144
-property Duration 21
-property ReleaseDate 20071217163916
-property CaptureDate 20071217163916
-property Framerate 7
-
-object http://sw.nokia.com/MdE Video "e:\testing\data\test3video2.mp4" 4184041685
-property Origin 0
-property Size 733064
-property TimeOffset 120
-property CreationDate 20071217163916
-property LastModifiedDate 20071217143916
-property Bitrate 288
-property Width 320
-property Height 240
-property Duration 20
-property ReleaseDate 20071217163916
-property CaptureDate 20071217163916
-property Framerate 14
-
-object http://sw.nokia.com/MdE Video "e:\testing\data\test4video1.3gp" 4184041685
-property Origin 0
-property Size 66192
-property TimeOffset 120
-property CreationDate 20071217163916
-property LastModifiedDate 20071217143916
-property ItemType "video/H263-2000"
-property Bitrate 23
-property Width 176
-property Height 144
-property Duration 21
-property ReleaseDate 20071217163916
-property CaptureDate 20071217163916
-property Framerate 7
-
-object http://sw.nokia.com/MdE Video "e:\testing\data\test4video2" 4184041685
-property Origin 0
-property Size 733064
-property TimeOffset 120
-property CreationDate 20071217163916
-property LastModifiedDate 20071217143916
-property Bitrate 288
-property Width 320
-property Height 240
-property Duration 20
-property ReleaseDate 20071217163916
-property CaptureDate 20071217163916
-property Framerate 14
-
-object http://sw.nokia.com/MdE Video "e:\testing\data\test26video1.3gp" 4184041685
-property Origin 0
-property Size 66192
-property TimeOffset 120
-property CreationDate 20080808000000
-property LastModifiedDate 20080808000000
-property ItemType "video/H263-2000"
-property Bitrate 23
-property Size 12345678
-property Rating 4
-property Width 176
-property Height 144
-property Duration 21
-property ReleaseDate 20080808000000
-property CaptureDate 20080808000000
-property Framerate 7
-property DRM 0
-
-object http://sw.nokia.com/MdE Video "e:\testing\data\testvideo1.3gp" 4184041685
-property Origin 0
-property Size 66192
-property TimeOffset 120
-property CreationDate 20071217163916
-property LastModifiedDate 20071217143916
-property ItemType "video/H263-2000"
-property Bitrate 23
-property Width 176
-property Height 144
-property Duration 21
-property ReleaseDate 20071217163916
-property CaptureDate 20071217163916
-property Framerate 7
-
-object http://sw.nokia.com/MdE Video "e:\testing\data\testvideo2.mp4" 4184041685
-property Origin 0
-property Size 733064
-property TimeOffset 120
-property CreationDate 20071217163916
-property LastModifiedDate 20071217143916
-property Bitrate 288
-property Width 320
-property Height 240
-property Duration 20
-property ReleaseDate 20071217163916
-property CaptureDate 20071217163916
-property Framerate 14
+object http://sw.nokia.com/MdE Video "e:\testing\data\test2video1.3gp" 4184041685
+property Origin 0
+property Size 66192
+property TimeOffset 120
+property CreationDate 20071217163916
+property LastModifiedDate 20071217143916
+property ItemType "video/H263-2000"
+property Bitrate 23
+property Width 176
+property Height 144
+property Duration 21
+property ReleaseDate 20071217163916
+property CaptureDate 20071217163916
+property Framerate 7
+
+object http://sw.nokia.com/MdE Video "e:\testing\data\test2video2.mp4" 4184041685
+property Origin 0
+property Size 733064
+property TimeOffset 120
+property CreationDate 20071217163916
+property LastModifiedDate 20071217143916
+property Bitrate 288
+property Width 320
+property Height 240
+property Duration 20
+property ReleaseDate 20071217163916
+property CaptureDate 20071217163916
+property Framerate 14
+
+object http://sw.nokia.com/MdE Video "e:\testing\data\test3video1.3gp" 4184041685
+property Origin 0
+property Size 66192
+property TimeOffset 120
+property CreationDate 20071217163916
+property LastModifiedDate 20071217143916
+property ItemType "video/H263-2000"
+property Bitrate 23
+property Width 176
+property Height 144
+property Duration 21
+property ReleaseDate 20071217163916
+property CaptureDate 20071217163916
+property Framerate 7
+
+object http://sw.nokia.com/MdE Video "e:\testing\data\test3video2.mp4" 4184041685
+property Origin 0
+property Size 733064
+property TimeOffset 120
+property CreationDate 20071217163916
+property LastModifiedDate 20071217143916
+property Bitrate 288
+property Width 320
+property Height 240
+property Duration 20
+property ReleaseDate 20071217163916
+property CaptureDate 20071217163916
+property Framerate 14
+
+object http://sw.nokia.com/MdE Video "e:\testing\data\test4video1.3gp" 4184041685
+property Origin 0
+property Size 66192
+property TimeOffset 120
+property CreationDate 20071217163916
+property LastModifiedDate 20071217143916
+property ItemType "video/H263-2000"
+property Bitrate 23
+property Width 176
+property Height 144
+property Duration 21
+property ReleaseDate 20071217163916
+property CaptureDate 20071217163916
+property Framerate 7
+
+object http://sw.nokia.com/MdE Video "e:\testing\data\test4video2" 4184041685
+property Origin 0
+property Size 733064
+property TimeOffset 120
+property CreationDate 20071217163916
+property LastModifiedDate 20071217143916
+property Bitrate 288
+property Width 320
+property Height 240
+property Duration 20
+property ReleaseDate 20071217163916
+property CaptureDate 20071217163916
+property Framerate 14
+
+object http://sw.nokia.com/MdE Video "e:\testing\data\test26video1.3gp" 4184041685
+property Origin 0
+property Size 66192
+property TimeOffset 120
+property CreationDate 20080808000000
+property LastModifiedDate 20080808000000
+property ItemType "video/H263-2000"
+property Bitrate 23
+property Size 12345678
+property Rating 4
+property Width 176
+property Height 144
+property Duration 21
+property ReleaseDate 20080808000000
+property CaptureDate 20080808000000
+property Framerate 7
+property DRM 0
+
+object http://sw.nokia.com/MdE Video "e:\testing\data\testvideo1.3gp" 4184041685
+property Origin 0
+property Size 66192
+property TimeOffset 120
+property CreationDate 20071217163916
+property LastModifiedDate 20071217143916
+property ItemType "video/H263-2000"
+property Bitrate 23
+property Width 176
+property Height 144
+property Duration 21
+property ReleaseDate 20071217163916
+property CaptureDate 20071217163916
+property Framerate 7
+
+object http://sw.nokia.com/MdE Video "e:\testing\data\testvideo2.mp4" 4184041685
+property Origin 0
+property Size 733064
+property TimeOffset 120
+property CreationDate 20071217163916
+property LastModifiedDate 20071217143916
+property Bitrate 288
+property Width 320
+property Height 240
+property Duration 20
+property ReleaseDate 20071217163916
+property CaptureDate 20071217163916
+property Framerate 14
  
\ No newline at end of file
diff -r aa5a574040a4 -r 5210ffae7137 mds_plat/metadata_engine_api/tsrc/eabi/MdETestScripteru.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mds_plat/metadata_engine_api/tsrc/eabi/MdETestScripteru.def	Wed Jul 14 07:57:22 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
+
diff -r aa5a574040a4 -r 5210ffae7137 metadataengine/client/group/mdeclient.mmp
--- a/metadataengine/client/group/mdeclient.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/metadataengine/client/group/mdeclient.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -32,7 +32,7 @@
 
 #if defined(WINSCW)
     deffile ../bwincw/mdeclientu.def
-#elif defined(ARMCC)
+#elif defined(EABI)
     deffile ../eabi/mdeclientu.def
 #endif
 nostrictdef
diff -r aa5a574040a4 -r 5210ffae7137 metadataengine/common/group/mdccommon.mmp
--- a/metadataengine/common/group/mdccommon.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/metadataengine/common/group/mdccommon.mmp	Wed Jul 14 07:57:22 2010 +0300
@@ -29,7 +29,7 @@
 
 #if defined(WINSCW)
     deffile ../bwincw/mdccommonu.def
-#elif defined(ARMCC)
+#elif defined(EABI)
     deffile ../eabi/mdccommonu.def
 #endif
 nostrictdef
diff -r aa5a574040a4 -r 5210ffae7137 sis/mds/mds_stub.sis
Binary file sis/mds/mds_stub.sis has changed
diff -r aa5a574040a4 -r 5210ffae7137 sis/mds/package.pkg
--- a/sis/mds/package.pkg	Tue Jul 06 14:44:37 2010 +0300
+++ b/sis/mds/package.pkg	Wed Jul 14 07:57:22 2010 +0300
@@ -17,7 +17,7 @@
 &EN
 
 ;packet-header (name, uid, major, minor, build, type)
-#{"Metadata System Upgrade"},(0x200009F5), 10, 10, 10, TYPE=SA, RU
+#{"Metadata System Upgrade"},(0x200009F5), 10, 10, 11, TYPE=SA, RU
 
 ; Localised vendor name
 %{"Nokia"}
diff -r aa5a574040a4 -r 5210ffae7137 sis/mds/package_cellid_reverse_geocode_enabled.pkg
--- a/sis/mds/package_cellid_reverse_geocode_enabled.pkg	Tue Jul 06 14:44:37 2010 +0300
+++ b/sis/mds/package_cellid_reverse_geocode_enabled.pkg	Wed Jul 14 07:57:22 2010 +0300
@@ -17,7 +17,7 @@
 &EN
 
 ;packet-header (name, uid, major, minor, build, type)
-#{"Metadata System Upgrade"},(0x200009F5), 10, 10, 9, TYPE=SA, RU
+#{"Metadata System Upgrade"},(0x200009F5), 10, 10, 11, TYPE=SA, RU
 
 ; Localised vendor name
 %{"Nokia"}
diff -r aa5a574040a4 -r 5210ffae7137 sis/mds/package_cellidenabled.pkg
--- a/sis/mds/package_cellidenabled.pkg	Tue Jul 06 14:44:37 2010 +0300
+++ b/sis/mds/package_cellidenabled.pkg	Wed Jul 14 07:57:22 2010 +0300
@@ -17,7 +17,7 @@
 &EN
 
 ;packet-header (name, uid, major, minor, build, type)
-#{"Metadata System Upgrade"},(0x200009F5), 10, 10, 9, TYPE=SA, RU
+#{"Metadata System Upgrade"},(0x200009F5), 10, 10, 11, TYPE=SA, RU
 
 ; Localised vendor name
 %{"Nokia"}
diff -r aa5a574040a4 -r 5210ffae7137 sis/mds/package_separate.pkg
--- a/sis/mds/package_separate.pkg	Tue Jul 06 14:44:37 2010 +0300
+++ b/sis/mds/package_separate.pkg	Wed Jul 14 07:57:22 2010 +0300
@@ -17,7 +17,7 @@
 &EN
 
 ;packet-header (name, uid, major, minor, build, type)
-#{"Metadata System Upgrade"},(0x200009F5), 10, 10, 10, TYPE=SA, RU
+#{"Metadata System Upgrade"},(0x200009F5), 10, 10, 11, TYPE=SA, RU
 
 ; Localised vendor name
 %{"Nokia"}
diff -r aa5a574040a4 -r 5210ffae7137 sis/mds/stub.pkg
--- a/sis/mds/stub.pkg	Tue Jul 06 14:44:37 2010 +0300
+++ b/sis/mds/stub.pkg	Wed Jul 14 07:57:22 2010 +0300
@@ -17,7 +17,7 @@
 &EN
 
 ; Header
-#{"Metadata System"}, (0x200009F5), 10, 10, 10, TYPE=SA
+#{"Metadata System"}, (0x200009F5), 10, 10, 11, TYPE=SA
 
 ; Localised Vendor name
 %{"Nokia"}