Bug 950830 - Clean up TextTrackCue style and TODO comments. r=rillian
Bug 956796 - A bad assertion and a typo in the pref name cancelled each other. Fix, and create #defines for the pref names in this file to avoid problems like this. r=BenWa
Bug 957236 - Fix infinite loop on win32 when network interfaces contain a '.'. r=ekr
Bug 957856 - Synchronize mach with upstream repository; r=ahal

The test changes and setup.py are NPOTB. base.py and main.py
added a new feature to declare global arguments.

--HG--
extra : rebase_source : 4b14487d9aff98247464e0b0c08b4fc5cfbd862a