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)
Conflicts:
res/values-ca/strings.xml
res/values-cs/strings.xml
res/values-fr/strings.xml
res/values-pt/strings.xml


Trivial merge