am 52ebff3c: am 5cc07252: Merge "Add warning magic to be a bit more reasonable." into froyo

Merge commit '52ebff3c47eb3fcd43d0337a43312240f7d2010e' into kraken

* commit '52ebff3c47eb3fcd43d0337a43312240f7d2010e':
  Add warning magic to be a bit more reasonable.