Merge branch 'master' into harmattan
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 15 Oct 2010 09:55:02 +0000 (12:55 +0300)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 15 Oct 2010 09:55:02 +0000 (12:55 +0300)
commit879ff63956133f0584882e858ce881ffd700f0b0
treee63f3d4ba3884233181a1599745e490ef8373343
parent56e179c969600a864d89c85802fd582a64f429d3
parent703deadd6a26c1f4a037afead0c8f1d2df16dcc2
Merge branch 'master' into harmattan