Thanks, I suggest you apply this to trunk now. Remember the ChangeLog entry, and try to add a NEWS entry that summarizes the changes that users will care about. Then you can close this bug report, by sending a mail to 17854-done@debbugs. Thanks!