OSDN Git Service

Merge remote-tracking branch 'origin/2.3' into 2.4
authorEike Ziller <eike.ziller@nokia.com>
Fri, 7 Oct 2011 06:42:00 +0000 (08:42 +0200)
committerEike Ziller <eike.ziller@nokia.com>
Fri, 7 Oct 2011 06:42:00 +0000 (08:42 +0200)
commit37b05178c35e8f81f486d76d042be7f9e6ee5040
tree444666b226808a12fd21f4219382abe9411add14
parent457bc75a85d01a3e94b4205e3463bec808e99ca8
parentfd4078f9633df169ba82aaf2ec7b971610efe0aa
Merge remote-tracking branch 'origin/2.3' into 2.4