Merge branch 'master' into HEAD
authormunkyu.im <munkyu.im@samsung.com>
Fri, 12 Aug 2011 07:59:26 +0000 (16:59 +0900)
committermunkyu.im <munkyu.im@samsung.com>
Fri, 12 Aug 2011 07:59:26 +0000 (16:59 +0900)

Trivial merge