r6942: * merging the registry changes back to the 3.0 tree