Merge branch 'master' into tizen_2.2
authorsunggun.jung <sunggun.jung@samsung.com>
Thu, 4 Jul 2013 07:05:05 +0000 (16:05 +0900)
committersunggun.jung <sunggun.jung@samsung.com>
Thu, 4 Jul 2013 07:06:28 +0000 (16:06 +0900)
Change-Id: Ibd56ebf095cadb12928be14d2f390bc4bb2f9a52


Trivial merge