Big merge from experimental to bleeding edge.

pkg/intl/lib/src/lazy_locale_data.dart

Index: pkg/intl/lib/src/lazy_locale_data.dart
diff --git a/pkg/intl/lib/src/lazy_locale_data.dart b/pkg/intl/lib/src/lazy_locale_data.dart
index 66acbdf550b71980d292cb71b206775e3ee82d1a..a7ec331949b1fcc79d61403448a04161522772f5 100644
--- a/pkg/intl/lib/src/lazy_locale_data.dart
+++ b/pkg/intl/lib/src/lazy_locale_data.dart
@@ -9,9 +9,10 @@
  */
 
 library lazy_locale_data;
+import 'dart:async';
 import 'dart:uri';
 import 'intl_helpers.dart';
-import 'dart:json';
+import 'dart:json' as json;
 
 /**
  * This implements the very basic map-type operations which are used
@@ -99,7 +100,7 @@ class LazyLocaleData {
    */
   Future initLocale(String localeName) {
     var data = _reader.read(localeName);
-    return jsonData(data).transform( (input) {
+    return jsonData(data).then( (input) {
         map[localeName] = _creationFunction(input);});
   }
 
@@ -108,6 +109,6 @@ class LazyLocaleData {
    * return another future that parses the JSON into a usable format.
    */
   Future jsonData(Future input) {
-    return input.transform( (response) => JSON.parse(response));
+    return input.then( (response) => json.parse(response));
   }
-}
+}