Bug 920414 - (part 2)