Merge branch 'master' of ssh://git.enlightenment.org/core/efl
authorChunEon Park <hermet@hermet.pe.kr>
Thu, 14 Aug 2014 04:15:22 +0000 (13:15 +0900)
committerChunEon Park <hermet@hermet.pe.kr>
Thu, 14 Aug 2014 04:15:22 +0000 (13:15 +0900)

Trivial merge