am f8a93cb7: (-s ours) am 8c9eacd9: Merge "DO NOT MERGE. Use the new...

am f8a93cb7: (-s ours) am 8c9eacd9: Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." into gingerbread

Merge commit 'f8a93cb7b9df2d6e84940b2f8741f8fd730d4c16'

* commit 'f8a93cb7b9df2d6e84940b2f8741f8fd730d4c16':
  DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags.