Merge remote branch 'cyanogen/eclair' into eclair