Merge branch 'master' into tizen_2.0
authorsunil85.kim <sunil85.kim@samsung.com>
Wed, 23 Jan 2013 04:24:05 +0000 (13:24 +0900)
committersunil85.kim <sunil85.kim@samsung.com>
Wed, 23 Jan 2013 04:24:08 +0000 (13:24 +0900)
Change-Id: Ie5759c79925b9d8fb32edd3d7240d1721abb4fb3


Trivial merge