OSDN Git Service

Merge remote-tracking branch 'korg/froyo-release' into froyo-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 25 Mar 2011 09:29:03 +0000 (17:29 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 25 Mar 2011 09:29:03 +0000 (17:29 +0800)
Conflicts:
core/version_defaults.mk


Trivial merge