Merge branch 'dev' into plt_branch
authorAlexander Aksenov <a.aksenov@samsung.com>
Fri, 2 Nov 2012 14:59:12 +0000 (18:59 +0400)
committerAlexander Aksenov <a.aksenov@samsung.com>
Fri, 2 Nov 2012 14:59:12 +0000 (18:59 +0400)
commit479fb7b6569b75378d6a61bed17de82a0eff75d2
tree1afc9eb1e34e395133f0859f54a355be910ae3c0
parentdb8618827f389e167f87bae32f65530ef07f236a
parent9e6c3d578d9844400ccd65b152bdfa7fb4e32c71
Merge branch 'dev' into plt_branch