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

Trivial merge