Merge commit '7566c1de' into eclair * commit '7566c1de': LocationManager: Fix problem replacing GPS and network providers with a mock provider.