--- a/fontsupport/group/bld.inf	Tue Jun 22 19:20:47 2010 +0800
+++ b/fontsupport/group/bld.inf	Tue Jul 06 22:48:31 2010 +0800
@@ -15,6 +15,7 @@
 *
 */
 
-
+#ifndef FF_PRODUCT_FONTS
 #include "../fontprovider/Group/bld.inf"
+#endif
 #include "../fontutils/group/bld.inf"

--- a/locales/loce32/region/src/region.cpp	Tue Jun 22 19:20:47 2010 +0800
+++ b/locales/loce32/region/src/region.cpp	Tue Jul 06 22:48:31 2010 +0800
@@ -45,8 +45,8 @@
 	aLocale->iStartOfWeek=RegionAspect::StartOfWeek;
 	aLocale->iClockFormat=RegionAspect::ClockFormat;
 	aLocale->iUnitsGeneral=RegionAspect::UnitsGeneral;
-	aLocale->iUnitsDistanceLong=RegionAspect::UnitsGeneral;
-	aLocale->iUnitsDistanceShort=RegionAspect::UnitsGeneral;
+	aLocale->iUnitsDistanceLong=RegionAspect::UnitsDistanceLong;
+	aLocale->iUnitsDistanceShort=RegionAspect::UnitsDistanceShort;
 	aLocale->iExtraNegativeCurrencyFormatFlags=RegionAspect::ExtraNegativeCurrencyFormatFlags;
 	aLocale->iDeviceTimeState = EDeviceUserTime;
 	}