Merge missing files
Bug 943134 - Puppetize a dedicated VM for AWS related management tools. r=dustin
Merging from default

changeset:   1561:efaed90eb35a
parent:      1558:de62e65488da
parent:      1560:22fc415772d7
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Tue Mar 25 13:25:35 2014 -0400
summary:     Merge missing files

changeset:   1562:e7d42d43948d
tag:         tip
user:        Rail Aliiev <rail@mozilla.com>
date:        Tue Mar 25 13:43:15 2014 -0400
summary:     Bug 943134 - Puppetize a dedicated VM for AWS related management tools. r=dustin

--HG--
branch : production