Merge branch 'private-develop' into develop
authorJenkins <taeyoung2.son@samsung.com>
Mon, 13 Aug 2012 09:20:19 +0000 (18:20 +0900)
committerJenkins <taeyoung2.son@samsung.com>
Mon, 13 Aug 2012 09:20:19 +0000 (18:20 +0900)

Trivial merge