Emotion migration revision 70375
authorMyungjae Lee <mjae.lee@samsung.com>
Wed, 25 Apr 2012 04:58:34 +0000 (13:58 +0900)
committerMyungjae Lee <mjae.lee@samsung.com>
Wed, 25 Apr 2012 04:58:44 +0000 (13:58 +0900)
Merge remote-tracking branch 'remotes/origin/upstream'


Trivial merge