Merge branch 'buffer_fix' into dev
authorVasiliy Ulyanov <v.ulyanov@samsung.com>
Mon, 17 Dec 2012 06:40:46 +0000 (10:40 +0400)
committerVasiliy Ulyanov <v.ulyanov@samsung.com>
Mon, 17 Dec 2012 06:40:46 +0000 (10:40 +0400)

Trivial merge