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)
commit55aba64f31f6d12f8c4cf7aaea97fcafea2f0246
tree07574e2d6a880a8ef13f3c3962ff09d93cfc49b1
parentf2ab365e7eac1e7e3e6fa2cd3e61da2423c83576
parente0f4c09ccea16eec68f8e612a003593f166890b6
Merge branch 'dev' into new_dpf