Merge commit 'e1e5ff3742fb8a72eec9d5ddc52adae4b80b8ad3' * commit 'e1e5ff3742fb8a72eec9d5ddc52adae4b80b8ad3': Move updated 6.xml from eclair-sholes-release into eclair
Merge commit 'e1e5ff3742fb8a72eec9d5ddc52adae4b80b8ad3' * commit 'e1e5ff3742fb8a72eec9d5ddc52adae4b80b8ad3': Move updated 6.xml from eclair-sholes-release into eclair