Comment 9 for bug 254901

I think I signed the agreement sometime back in 2009, I will check tomorrow, and see if these two branches are still mergeable. Since I haven't look at them for a long time.