Merge branch '2.0_beta' of ssh://112.106.1.251:29418/framework/uifw/edje into 2.0_beta 2.0alpha master 2.0_alpha submit/master/20120920.151121 submit/master/20120920.151122
authorChunEon Park <chuneon.park@samsung.com>
Sat, 1 Sep 2012 07:19:24 +0000 (16:19 +0900)
committerChunEon Park <chuneon.park@samsung.com>
Sat, 1 Sep 2012 07:19:24 +0000 (16:19 +0900)

Trivial merge