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)
commit9d269c4c2ece95807932f3b0e92ec191bf3baf3e
tree36f8b33e28786317774826a4efdb4f801671e5bd
parentb0e801ec1e60ffda74129873c9da28ecd75772fc
parent6aae2463d78966c12e8e286316dfff79d6b3b3a9
Merge branch 'upstream' into devel/x11