Merge "Merge remote branch 'korg/froyo' into gingerbread" into gingerbread
tree: 4148bc8d18fda85787593985f1f2466f4ba131d0
  1. tests/