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