Merge commit '898897338dfd62a268a89fb55ee900a9bd5a683f' into eclair-mr2 * commit '898897338dfd62a268a89fb55ee900a9bd5a683f': Fix bug 2201417. Whenever the System setting that indicates
Merge commit '898897338dfd62a268a89fb55ee900a9bd5a683f' into eclair-mr2 * commit '898897338dfd62a268a89fb55ee900a9bd5a683f': Fix bug 2201417. Whenever the System setting that indicates