Code drop from //branches/cupcake/...@124589
tree: 998a9af735ff91bb16c05e8411ac282c1fb57b48
  1. src/