Bug 1085356: Bustage fix (missing include from merge) r=bustage a=bustage