Merge commit '3923c56bceefaa31b27ca213271947eab20d2f98' into develop
authorkt920.kim <kt920.kim@samsung.com>
Mon, 16 Jan 2012 01:15:01 +0000 (10:15 +0900)
committerkt920.kim <kt920.kim@samsung.com>
Mon, 16 Jan 2012 01:15:01 +0000 (10:15 +0900)
Change-ID: I4fc88529270d053bbfedfa07a1beef6202a1d2e2


Trivial merge