merge to production

--HG--
branch : production
Merge default -> production

changeset:   1060:2f41c94c03a7
tag:         tip
parent:      1058:4e81c3847270
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Wed Nov 06 10:23:17 2013 -0500
summary:     Bug 929048 - deploy kvm to Linux64 hosts (in-house and ec2). r=dustin

--HG--
branch : production
merge to production

--HG--
branch : production
Merge default -> production

--HG--
branch : production
Merge default -> production

--HG--
branch : production
Merge default -> production

--HG--
branch : production
Bug 920626: collectd deployment batch 3; r=dustin

--HG--
branch : production
Merge production -> default