Merge commit 'f36b8f43' into eclair-mr2 * commit 'f36b8f43': This time for sure: make wallpapers work