Merge commit '6a98f8d93e4ddd407baad8d9b7481a892001d281' into eclair * commit '6a98f8d93e4ddd407baad8d9b7481a892001d281': Fix content provider
Merge commit '6a98f8d93e4ddd407baad8d9b7481a892001d281' into eclair * commit '6a98f8d93e4ddd407baad8d9b7481a892001d281': Fix content provider