Merge branch 'master' into release
authortaeyoung2.son <taeyoung2.son@samsung.com>
Tue, 12 Jul 2011 07:35:14 +0000 (16:35 +0900)
committertaeyoung2.son <taeyoung2.son@samsung.com>
Tue, 12 Jul 2011 07:35:14 +0000 (16:35 +0900)

Trivial merge