Merge branch 'develop' into release
authorsungmin82.ha <sungmin82.ha@samsung.com>
Fri, 20 Jan 2012 02:10:30 +0000 (11:10 +0900)
committersungmin82.ha <sungmin82.ha@samsung.com>
Fri, 20 Jan 2012 02:11:51 +0000 (11:11 +0900)
Change-Id: I2d72f606bb2189551acbcec913f58277e7d93745


Trivial merge