Merge commit '04e1faf0f030ddb360180289fb798adbb3348dd4' into eclair-plus-aosp * commit '04e1faf0f030ddb360180289fb798adbb3348dd4': Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).
Merge commit '04e1faf0f030ddb360180289fb798adbb3348dd4' into eclair-plus-aosp * commit '04e1faf0f030ddb360180289fb798adbb3348dd4': Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).