Comment 17 for bug 1483015

Whew.. I have tested it with 3 other systems, including Windows and so far it looked fine. Committed in 6110, but if there are more problems resulting from saving the canvas type, then it really has to wait for the post-stable period.