Merge commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8' into eclair-mr2 * commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8': Feature #2296147 Settings for Car/Desk Dock on certain devices
Merge commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8' into eclair-mr2 * commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8': Feature #2296147 Settings for Car/Desk Dock on certain devices