Comment 2 for bug 799694

Code uploaded, builds requested. Let's see if it works.