back out 115390977e9f.
Merging default -> production
changeset:   3649:643fb06fdae4
tag:         tip
parent:      3646:7c9ef8ecb6b7
user:        Aki Sasaki <asasaki@mozilla.com>
date:        Fri Apr 18 11:21:30 2014 -0700
summary:     back out 115390977e9f.

--HG--
branch : production-0.8