Merge branch 'dev' into new_dpf
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 29 Jan 2013 09:14:16 +0000 (13:14 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 29 Jan 2013 09:14:16 +0000 (13:14 +0400)

Trivial merge