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)
commit3a99f4f947b54797192e183a3bd07a15ac9302e8
tree6fd1e05ab4d89046360229aad75744a9c339665d
parent5f0276a53e0e0ef9ceb45c3aff711595fa05fc8a
parent25c4972eab1f5c8fd1d0615e73137f5479812262
Merge branch 'master' into tizen_2.2

Change-Id: I4c152ad4eab8af4ed65a4cdbb77f85992394796d