Merge branch 'master' of ssh://git.enlightenment.org/core/efl
authorChunEon Park <hermet@hermet.pe.kr>
Wed, 3 Sep 2014 12:05:27 +0000 (21:05 +0900)
committerChunEon Park <hermet@hermet.pe.kr>
Wed, 3 Sep 2014 12:05:27 +0000 (21:05 +0900)

Trivial merge