Merge commit 'a8a974bd171ccbc3b35b18c3e73a23d22834d05e' into eclair-mr2-plus-aosp * commit 'a8a974bd171ccbc3b35b18c3e73a23d22834d05e': Fix for 1974140. Delete entry if not valid on hitting home.
Merge commit 'a8a974bd171ccbc3b35b18c3e73a23d22834d05e' into eclair-mr2-plus-aosp * commit 'a8a974bd171ccbc3b35b18c3e73a23d22834d05e': Fix for 1974140. Delete entry if not valid on hitting home.