# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1275477598 -3600
# Node ID 131338d284c2424a26e56edfe011fd9fa981abc5
# Parent  1d6b4c6620ba85808789b19d37af89561ca0c1a5# Parent  e04be45adff82f192e2064a12aa0b130d5d268ed
Re-merge fixes for bugs 476, 1895, 2049, 2149, 2509 and 2539.

diff -r e04be45adff8 -r 131338d284c2 imgtools_os/romkiteka2/include/textshell.oby
--- a/imgtools_os/romkiteka2/include/textshell.oby	Tue May 18 14:32:52 2010 +0100
+++ b/imgtools_os/romkiteka2/include/textshell.oby	Wed Jun 02 12:19:58 2010 +0100
@@ -32,6 +32,22 @@
 #define _STARTUPMODE1		// for sysstart.iby
 #endif
 
+#define __MMC
+#define __COVER_DISPLAY
+#define __IRDA
+#define __BT
+#define __USB
+#define __CS_VIDEO_TELEPHONY
+#define __DHCP
+#define __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#define __VIBRA
+#define __MTP_PROTOCOL_SUPPORT
+#define __SERIES60_KEYPAD_NO_SLIDER
+#define __DRIVE_MODE
+#define __SERIES60_AMBIENT_LIGHT_SENSOR
+#define __UPNP_PRINT_FRAMEWORK
+#define FF_FMTX
+
 // The following 3 macros need to be removed once LibXML2 is depended 
 // by any of the component in textshell image.
 #define SYMBIAN_EXCLUDE_LIBXML2
diff -r e04be45adff8 -r 131338d284c2 toolsandutils/productionbldtools/BAK/distribution.policy
--- a/toolsandutils/productionbldtools/BAK/distribution.policy	Tue May 18 14:32:52 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD:	Reference/Test	Tools
diff -r e04be45adff8 -r 131338d284c2 toolsandutils/productionbldtools/BFrC/distribution.policy
--- a/toolsandutils/productionbldtools/BFrC/distribution.policy	Tue May 18 14:32:52 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD:	Reference/Test	Tools
diff -r e04be45adff8 -r 131338d284c2 toolsandutils/productionbldtools/distillsrc/distribution.policy
--- a/toolsandutils/productionbldtools/distillsrc/distribution.policy	Tue May 18 14:32:52 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD:	Reference/Test	Tools
diff -r e04be45adff8 -r 131338d284c2 toolsandutils/productionbldtools/distillsrc/test/distribution.policy
--- a/toolsandutils/productionbldtools/distillsrc/test/distribution.policy	Tue May 18 14:32:52 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD:	Reference/Test	Tools
diff -r e04be45adff8 -r 131338d284c2 toolsandutils/productionbldtools/distillsrc/test/source/complete/distribution.policy
--- a/toolsandutils/productionbldtools/distillsrc/test/source/complete/distribution.policy	Tue May 18 14:32:52 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD:	Reference/Test	Tools
diff -r e04be45adff8 -r 131338d284c2 toolsandutils/productionbldtools/distillsrc/test/source/distribution.policy
--- a/toolsandutils/productionbldtools/distillsrc/test/source/distribution.policy	Tue May 18 14:32:52 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD:	Reference/Test	Tools
diff -r e04be45adff8 -r 131338d284c2 toolsandutils/productionbldtools/distillsrc/test/source/missing/distribution.policy
--- a/toolsandutils/productionbldtools/distillsrc/test/source/missing/distribution.policy	Tue May 18 14:32:52 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD:	Reference/Test	Tools
diff -r e04be45adff8 -r 131338d284c2 toolsandutils/productionbldtools/distillsrc/test/source/shared/distribution.policy
--- a/toolsandutils/productionbldtools/distillsrc/test/source/shared/distribution.policy	Tue May 18 14:32:52 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD:	Reference/Test	Tools
diff -r e04be45adff8 -r 131338d284c2 toolsandutils/productionbldtools/distillsrc/test/source/spacey/distribution.policy
--- a/toolsandutils/productionbldtools/distillsrc/test/source/spacey/distribution.policy	Tue May 18 14:32:52 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD:	Reference/Test	Tools
diff -r e04be45adff8 -r 131338d284c2 toolsandutils/productionbldtools/distillsrc/test/source/whole/distribution.policy
--- a/toolsandutils/productionbldtools/distillsrc/test/source/whole/distribution.policy	Tue May 18 14:32:52 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD:	Reference/Test	Tools
diff -r e04be45adff8 -r 131338d284c2 toolsandutils/productionbldtools/distribution.policy
--- a/toolsandutils/productionbldtools/distribution.policy	Tue May 18 14:32:52 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD:	Reference/Test	Tools