Merge branch 'master' into tizen_2.2 2.2_release
authorheeju.joo <heeju.joo@samsung.com>
Mon, 15 Jul 2013 06:13:28 +0000 (15:13 +0900)
committerheeju.joo <heeju.joo@samsung.com>
Mon, 15 Jul 2013 06:13:34 +0000 (15:13 +0900)
Change-Id: I4c152ad4eab8af4ed65a4cdbb77f85992394796d


Trivial merge