Big merge from experimental to bleeding edge.

pkg/intl/lib/intl.dart

Index: pkg/intl/lib/intl.dart
diff --git a/pkg/intl/lib/intl.dart b/pkg/intl/lib/intl.dart
index e2cd831abf8483ea9eb9757729e5a131a79e7e86..9214b662a3a5cc84120163b9c86683feda9946b5 100644
--- a/pkg/intl/lib/intl.dart
+++ b/pkg/intl/lib/intl.dart
@@ -16,6 +16,7 @@
  */
 library intl;
 
+import 'dart:async';
 import 'src/intl_helpers.dart';
 import 'dart:math';
 import 'date_symbols.dart';
@@ -127,7 +128,7 @@ class Intl {
    * will be extracted automatically but for the time being it must be passed
    * explicitly in the [name] and [args] arguments.
    */
-  static String message(String message_str, {final String desc: '',
+  static Future<String> message(String message_str, {final String desc: '',
       final Map examples: const {}, String locale, String name,
       List<String> args}) {
     return messageLookup.lookupMessage(
@@ -270,4 +271,4 @@ class Intl {
     if (_defaultLocale == null) _defaultLocale = systemLocale;
     return _defaultLocale;
   }
-}
+}