Merge branch 'alak_2' 4.2
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 29 Oct 2010 11:42:01 +0000 (14:42 +0300)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 29 Oct 2010 11:42:01 +0000 (14:42 +0300)
commit3da38af49f1fea386b7426659979564da39d5e16
tree0bbe1e827c083717c7ddd460fc63e2f74a8474de
parenta9fc107d4272acc2665b74e2e0a0a439c8f1c25f
parent47314c4da946419f9665216edd25fa36633d162f
Merge branch 'alak_2'