Merge branch 'master' of http://github.com/mono/mono

diff --git a/mcs/class/System.Core/System/TimeZoneInfo.cs b/mcs/class/System.Core/System/TimeZoneInfo.cs
index 1d60e07e6d17e4707f3cb801992e4691b91f3d10..6be3f8f8aeea342de94dde0b0b3f5f92795bdd6e 100644 (file)
--- a/mcs/class/System.Core/System/TimeZoneInfo.cs
+++ b/mcs/class/System.Core/System/TimeZoneInfo.cs
@@ -770,6 +770,18 @@ namespace System
                        return new DateTime (year, transition.Month, day) + transition.TimeOfDay.TimeOfDay;
                }
 
+               static List<AdjustmentRule> ValidateRules (List<AdjustmentRule> adjustmentRules)
+               {
+                       AdjustmentRule prev = null;
+                       foreach (AdjustmentRule current in adjustmentRules.ToArray ()) {
+                               if (prev != null && prev.DateEnd > current.DateStart) {
+                                       adjustmentRules.Remove (current);
+                               }
+                               prev = current;
+                       }
+                       return adjustmentRules;
+               }
+
 #if LIBC
                private static bool ValidTZFile (byte [] buffer, int length)
                {
@@ -916,18 +928,6 @@ namespace System
                        }
                }
 
-               static List<AdjustmentRule> ValidateRules (List<AdjustmentRule> adjustmentRules)
-               {
-                       AdjustmentRule prev = null;
-                       foreach (AdjustmentRule current in adjustmentRules.ToArray ()) {
-                               if (prev != null && prev.DateEnd > current.DateStart) {
-                                       adjustmentRules.Remove (current);
-                               }
-                               prev = current;
-                       }
-                       return adjustmentRules;
-               }
-
                static Dictionary<int, string> ParseAbbreviations (byte [] buffer, int index, int count)
                {
                        var abbrevs = new Dictionary<int, string> ();