Merge branch 'master' of ssh://git.enlightenment.org/core/efl
authorChunEon Park <hermet@hermet.pe.kr>
Tue, 2 Sep 2014 01:00:11 +0000 (10:00 +0900)
committerChunEon Park <hermet@hermet.pe.kr>
Tue, 2 Sep 2014 01:00:11 +0000 (10:00 +0900)

Trivial merge