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