bug 947956 - (Rev 1 for reviewing)