Comment 20 for bug 388746

Rolled in and building now.