52ebff3c47
Merge commit '5cc072522b51f796085a73545a3dd34a02877059' into froyo-plus-aosp * commit '5cc072522b51f796085a73545a3dd34a02877059': Add warning magic to be a bit more reasonable.