Merge branch 'devel/x11' into tizen
authorBoram Park <boram1288.park@samsung.com>
Fri, 1 Aug 2014 07:29:08 +0000 (16:29 +0900)
committerBoram Park <boram1288.park@samsung.com>
Fri, 1 Aug 2014 07:29:21 +0000 (16:29 +0900)
Change-Id: I7d326f46698d0ba6ace8f634bdbe4e9ba6835f4b


Trivial merge