Merge branch 'upstream' into devel/x11 submit/devel/x11/20140729.060828
authorBoram Park <boram1288.park@samsung.com>
Tue, 29 Jul 2014 06:07:48 +0000 (15:07 +0900)
committerBoram Park <boram1288.park@samsung.com>
Tue, 29 Jul 2014 06:07:48 +0000 (15:07 +0900)

Trivial merge