Merge commit 'e9e1cdd556b40a04637b7de3d839b2a596df47e3' into eclair * commit 'e9e1cdd556b40a04637b7de3d839b2a596df47e3': decode the search string before putting it into the search control.