Merge branch 'develop' into release
authormunkyu.im <munkyu.im@samsung.com>
Wed, 18 Jan 2012 13:03:00 +0000 (22:03 +0900)
committermunkyu.im <munkyu.im@samsung.com>
Wed, 18 Jan 2012 13:18:40 +0000 (22:18 +0900)
Change-Id: Ie523d4b7a913f2466786f7f2807c10a20459cbca


Trivial merge