Ubuntu

Comment 87 for bug 398128

Created attachment 460738
Patch v.6

Apply cleanly to trunk.