Merge branch 'alak_1st' into alak_1st_harm alak_1st_harm
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Wed, 10 Nov 2010 12:46:54 +0000 (14:46 +0200)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Wed, 10 Nov 2010 12:46:54 +0000 (14:46 +0200)
commit9773f239824c9eb2f3d1ccaf57b46e5c18e69491
treef15e1b54c765cbc2ad71bffb44dc45dbf47b7755
parentb49f7182a5f36969a860e229f6cadc4f296b1e51
parent6a0812a1a7b5e033287ddd492b745186bf15f1e1
Merge branch 'alak_1st' into alak_1st_harm