Merge branch 'alak_1st' into alak_1st_harm
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Thu, 4 Nov 2010 12:34:54 +0000 (14:34 +0200)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Thu, 4 Nov 2010 12:34:54 +0000 (14:34 +0200)
commita7b5890dd93ca0a2a02824f5461bd0ead3ad853e
tree7aac3c78fc8f29bf9dbc30047eeba8656ba4b081
parent334d2cc0cc66b81e0cc459c0f41016cd97b7c5ad
parent321b42d8ccd93face1581292f3f510a18be7aeed
Merge branch 'alak_1st' into alak_1st_harm