Merge m-c to b2g-inbound. a=merge

b2g/config/emulator-l/releng-emulator-l.tt

@@ -1,2 +1,9 @@
 [
+{
+"size": 80458572,
+"digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
+"algorithm": "sha512",
+"filename": "gcc.tar.xz",
+"unpack": "True"
+}
 ]

testing/marionette/client/requirements.txt

@@ -1,5 +1,5 @@
 marionette-transport == 0.4
-marionette-driver == 0.1
+marionette-driver == 0.2
 manifestparser
 mozhttpd >= 0.5
 mozinfo >= 0.7

testing/marionette/client/setup.py

@@ -1,8 +1,6 @@
-import os
 from setuptools import setup, find_packages
-import sys
 
-version = '0.8.7'
+version = '0.9'
 
 # dependencies
 with open('requirements.txt') as f:
@@ -12,7 +10,7 @@ setup(name='marionette_client',
       version=version,
       description="Marionette test automation client",
       long_description='See http://marionette-client.readthedocs.org/',
-      classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+      classifiers=[],  # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
       keywords='mozilla',
       author='Jonathan Griffin',
       author_email='jgriffin@mozilla.com',
@@ -29,4 +27,3 @@ setup(name='marionette_client',
       """,
       install_requires=deps,
       )
-

testing/marionette/driver/MANIFEST.in

@@ -0,0 +1,2 @@
+exclude MANIFEST.in
+include requirements.txt

testing/marionette/driver/setup.py

@@ -1,8 +1,6 @@
-import os
 from setuptools import setup, find_packages
-import sys
 
-version = '0.1.0'
+version = '0.2'
 
 # dependencies
 with open('requirements.txt') as f:
@@ -12,16 +10,14 @@ setup(name='marionette_driver',
       version=version,
       description="Marionette Driver",
       long_description='See http://marionette-driver.readthedocs.org/',
-      classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+      classifiers=[],  # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
       keywords='mozilla',
       author='Auto-tools',
       author_email='tools-marionette@lists.mozilla.org',
       url='https://wiki.mozilla.org/Auto-tools/Projects/Marionette',
       license='MPL',
       packages=find_packages(),
-      #package_data={'marionette_driver': ['touch/*.js']},
       include_package_data=True,
       zip_safe=False,
       install_requires=deps,
       )
-