Merge branch 'alak_1st' into alak_1st_harm
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 5 Nov 2010 07:11:32 +0000 (09:11 +0200)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 5 Nov 2010 07:11:32 +0000 (09:11 +0200)
commit374292dd08bbe1680a53f6efebb019ba60bbef5f
tree93b4217b280cee6e36abef311159082e189b98d7
parent86894c95aa2cd1988066880f5ff87e1be163dce8
parentde952e780687a53d5a18a737caffb7ec7cfed797
Merge branch 'alak_1st' into alak_1st_harm