Merge commit 'a3aaf19e09806f7e56c59621fc6c17e4429b2e6d' into eclair-plus-aosp * commit 'a3aaf19e09806f7e56c59621fc6c17e4429b2e6d': Fix setting passwd string and vpn checkbox titles.
Merge commit 'a3aaf19e09806f7e56c59621fc6c17e4429b2e6d' into eclair-plus-aosp * commit 'a3aaf19e09806f7e56c59621fc6c17e4429b2e6d': Fix setting passwd string and vpn checkbox titles.