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)

Trivial merge