   }
   
 *** misc/icu/source/common/unicode/ustring.h	Tue Aug 29 23:52:50 2006
+<<<<<<< icu-3.6.patch
 --- misc/build/icu/source/common/unicode/ustring.h	Tue Nov 13 13:03:51 2007
+=======
+--- misc/build/icu/source/common/unicode/ustring.h	Mon Jan 28 21:31:50 2008
+>>>>>>> 1.10.12.2
 ***************
 *** 918,924 ****
    * </pre>

  THREADSCPPFLAGS = -D_REENTRANT -D_PTHREADS
  LIBCPPFLAGS =
*** misc/icu/source/config/mh-linux	Thu Mar 23 19:51:52 2006
--- misc/build/icu/source/config/mh-linux	Tue Nov 13 13:03:52 2007
***************
*** 20,25 ****
--- 20,33 ----

          le_uint16 bits = fieldBits[format];
          le_uint16 count = 16 / bits;
*** misc/icu/source/layout/GXLayoutEngine.cpp	Fri Sep  2 20:22:10 2005
<<<<<<< icu-3.6.patch
--- misc/build/icu/source/layout/GXLayoutEngine.cpp	Tue Nov 13 13:03:52 2007
=======
--- misc/build/icu/source/layout/GXLayoutEngine.cpp	Mon Jan 28 21:31:51 2008
>>>>>>> 1.10.12.2
***************
*** 39,45 ****
          return 0;
