git merge master
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 17 Aug 2011 08:46:41 +0000 (17:46 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 17 Aug 2011 08:46:41 +0000 (17:46 +0900)

Trivial merge