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

Trivial merge