Merge branch 'alak_1st' into alak_1st_harm
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 5 Nov 2010 11:00:14 +0000 (13:00 +0200)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 5 Nov 2010 11:00:14 +0000 (13:00 +0200)
commitb49f7182a5f36969a860e229f6cadc4f296b1e51
tree4788f931b6b208a34dd63b57a0d276858d8ee970
parent09e8cd81f129316aa38f2d1c42d144b96c8f8efa
parent3575a5a4ea64e98cea212889f17351953b3ed4cd
Merge branch 'alak_1st' into alak_1st_harm