Bug 1013201 - Use in-tree config to override gaia build opts, if it exists, r=zac
Merging from default

changeset:   2876:8cec6396354b
tag:         tip
parent:      2873:03e447b25006
user:        Jonathan Griffin <jgriffin@mozilla.com>
date:        Thu Jun 19 15:24:35 2014 -0700
summary:     Bug 1013201 - Use in-tree config to override gaia build opts, if it exists, r=zac

--HG--
branch : production