OSDN Git Service

merge from donut-x86 eclair-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 5 Mar 2010 13:05:55 +0000 (21:05 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 5 Mar 2010 13:05:55 +0000 (21:05 +0800)
commitbbd639a879676dd1d605f3cd6c795bc86a15b9af
tree994e9183d24547447d23ca3036d7e865489f7e14
parentd7f9f30afc54d05bd37d1df7df4e0b7b4b77732c
parent546d9cde405df3bf701cff7c8a2dfc469d9f6277
merge from donut-x86

Conflicts:
res/values-ca/strings.xml
res/values-cs/strings.xml
res/values-fr/strings.xml
res/values-pt/strings.xml