Merge "Merge remote branch 'korg/froyo' into froyomerge" into gingerbread
tree: d208181c7ceaa950e56f5ba417648980ffad5849
  1. tests/