Merge commit 'ee110be02256b816ac6d863e39cb8b11b8071baa' into eclair-mr2 * commit 'ee110be02256b816ac6d863e39cb8b11b8071baa': Fix issue #2179891: Need to update 5.xml
Merge commit 'ee110be02256b816ac6d863e39cb8b11b8071baa' into eclair-mr2 * commit 'ee110be02256b816ac6d863e39cb8b11b8071baa': Fix issue #2179891: Need to update 5.xml