Merge branch 'testing' into dev
authorNikita Kalyazin <n.kalyazin@samsung.com>
Fri, 6 May 2011 13:15:31 +0000 (17:15 +0400)
committerNikita Kalyazin <n.kalyazin@samsung.com>
Fri, 6 May 2011 13:15:31 +0000 (17:15 +0400)
commit4a7d8354b55bff2cae3f7d25c09899fb34ff585d
tree54cb877d774e1a5ca87da51eddf962a5b5ebfa58
parent756e18c967c208c12889c6a156beee64a060067e
parentb15cf3c52ca360492e8eb135c2a9d67e7d6a634d
Merge branch 'testing' into dev