Merge commit '0e8450fcd8cd90007246b035ecbe651886337755' into release
authorkt920.kim <kt920.kim@samsung.com>
Wed, 18 Jan 2012 05:21:34 +0000 (14:21 +0900)
committerkt920.kim <kt920.kim@samsung.com>
Wed, 18 Jan 2012 05:21:34 +0000 (14:21 +0900)
Change-ID: I78f16f23d483b6d8385c617f96fd6071e5946fd3


Trivial merge