Merge branch 'master' into svn_merge
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 17 Aug 2011 08:47:12 +0000 (17:47 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 17 Aug 2011 08:47:12 +0000 (17:47 +0900)

Trivial merge