OSDN Git Service

Merge branch 'master' of ../mainline into dui-editor
authorRoberto Raggi <roberto.raggi@nokia.com>
Mon, 4 May 2009 08:42:03 +0000 (10:42 +0200)
committerRoberto Raggi <roberto.raggi@nokia.com>
Mon, 4 May 2009 08:42:03 +0000 (10:42 +0200)
commit715ac380bd763c93f8013f51f370fe231f2f0200
treeb7b13352ed26aa890995d0a767022d605567b68d
parent4c4df832de9cc4785ff77fd52c63a2ef92ececb1
parentab47d78c0c82d3806349462183c463a98d574885
Merge branch 'master' of ../mainline into dui-editor