Bustage fix for Bug 847607, CLOSED TREE

--HG--
extra : rebase_source : 5813d5213ce7aad43c6e8e74792e21656864200e