Merge branch 'release' into develop
authorTaeyoung Son <taeyoung2.son@samsung.com>
Mon, 30 Jan 2012 11:32:25 +0000 (20:32 +0900)
committerTaeyoung Son <taeyoung2.son@samsung.com>
Mon, 30 Jan 2012 11:32:25 +0000 (20:32 +0900)
Change-ID: I8d48de1cd96f7f076e3bff232e2228e4b5f660ed


Trivial merge