EFL core migration revision 70255
authorHyoyoung Chang <hyoyoung.chang@samsung.com>
Wed, 18 Apr 2012 06:06:25 +0000 (15:06 +0900)
committerHyoyoung Chang <hyoyoung.chang@samsung.com>
Wed, 18 Apr 2012 08:57:39 +0000 (17:57 +0900)
Merge remote-tracking branch 'remotes/origin/upstream'

Change-Id: I455b9c23bdf4052872dfa47408217c8ca6f5f112


Trivial merge