Merge from HEAD, changes from v20060729-2000 to v20060822-2020 (fix for bug 133744)
1 file changed