OSDN Git Service

Merge remote-tracking branch 'origin/2.4'
authorEike Ziller <eike.ziller@nokia.com>
Mon, 10 Oct 2011 13:29:31 +0000 (15:29 +0200)
committerEike Ziller <eike.ziller@nokia.com>
Mon, 10 Oct 2011 13:29:31 +0000 (15:29 +0200)

Trivial merge