Comment 18 for bug 774808

There seem to be a lot of changes in your branch that aren't related directly to this bug -- can you create a patch that would apply cleanly to trunk that just has the bugfix?