Merge remote branch 'korg/froyo' into gingerbread

Change-Id: Ieea971689f21c7a010c49d85818ef4ac089f3202
tree: 4148bc8d18fda85787593985f1f2466f4ba131d0
  1. tests/