Bug 1080351 - Part 1: Fix compiler errors caused by bug 1076698, r=jcranmer
Bug 1080351 - Part 2: Fix compiler errors caused by bug 1076698, r=Standard8
Bug 1080351 - Part 3: Fix compiler errors caused by bug 1076698, r=Fallen, a=jcranmer

--HG--
extra : amend_source : 02a573da60fbb16232c7ac65a4acee149043b43a