Merge commit 'b4ee8349cc7e64a264335ee2dfecc00980eca07a' into eclair-plus-aosp * commit 'b4ee8349cc7e64a264335ee2dfecc00980eca07a': Git sucks