Merge commit 'c2461be6279137f872becf695befeb7ba8770a64' into froyo-plus-aosp * commit 'c2461be6279137f872becf695befeb7ba8770a64': Fix 2579461
Merge commit 'c2461be6279137f872becf695befeb7ba8770a64' into froyo-plus-aosp * commit 'c2461be6279137f872becf695befeb7ba8770a64': Fix 2579461