Merge commit '007a429f09fb9e4e4fbd4205d03878874c9f7957' into eclair-mr2 * commit '007a429f09fb9e4e4fbd4205d03878874c9f7957': Update 5.xml with last minute changes.
Merge commit '007a429f09fb9e4e4fbd4205d03878874c9f7957' into eclair-mr2 * commit '007a429f09fb9e4e4fbd4205d03878874c9f7957': Update 5.xml with last minute changes.