Bug 1021230 - Add user 'mozauto' for QA, and changes for x server. r=dustin
Bug 1028104 - tps_ci and mozmill_ci server should have a mozauto builder account. a=org-only
merge build/default to qa/default
Bug 1029614 - Make screenresolution configurable for specific resolutions. r=dustin
Bug 997721 - Add proxy support for gui applications on OS X. r=dustin
Bug 1032133 - Don't inherit environment variables for puppet agent runs. r=dustin
Bug 1008880 - Create Java package. r=dustin
Bug 1039651: always ensure proxy_reset_env.sh exists
Bug 1039651: fix setproxy.sh for OS X, change '.' to 'source'
Bug 1021230 - Add user 'mozauto' for QA, and changes for x server. r=dustin
Bug 1028104 - tps_ci and mozmill_ci server should have a mozauto builder account. a=org-only
Bug 1029614 - Make screenresolution configurable for specific resolutions. r=dustin
Bug 997721 - Add proxy support for gui applications on OS X. r=dustin
Bug 1032133 - Don't inherit environment variables for puppet agent runs. r=dustin
Bug 1008880 - Create Java package. r=dustin
Bug 1039651: always ensure proxy_reset_env.sh exists
Bug 1039651: fix setproxy.sh for OS X, change '.' to 'source'
Bug 1039651: empty merge containing the previous few commits
Merge default -> production

--HG--
branch : production