Merge branch 'tizen_2.1' into tizen_2.2
authorhs321.lee <hs321.lee@samsung.com>
Wed, 5 Jun 2013 06:25:47 +0000 (15:25 +0900)
committerhs321.lee <hs321.lee@samsung.com>
Wed, 5 Jun 2013 06:26:46 +0000 (15:26 +0900)
Change-Id: I3f70d27a84bc4d91d3cfaa5928dd245edd8bb11d
Signed-off-by: hs321.lee <hs321.lee@samsung.com>

Trivial merge