Bug 853209 - Bustage fix, with feeling. a=bustage
CLOSED TREE