sunnyvale hacking, yesterday and today. rebased patch for bug 808370. work for bugs 587757 and 846606