Merge branch 'tizen_2.1' into tizen_2.2
authorwoo <s-w.woo@samsung.com>
Wed, 5 Jun 2013 09:46:11 +0000 (18:46 +0900)
committerwoo <s-w.woo@samsung.com>
Wed, 5 Jun 2013 09:46:42 +0000 (18:46 +0900)
Change-Id: Ic91b8ab375454313e82807cd279210db551fe500


Trivial merge