Merge branch 'master' into tizen_2.1 submit/tizen_2.1/20130320.090312
authorjy910.yun <jy910.yun@samsung.com>
Wed, 20 Mar 2013 09:02:06 +0000 (18:02 +0900)
committerjy910.yun <jy910.yun@samsung.com>
Wed, 20 Mar 2013 09:02:29 +0000 (18:02 +0900)
Change-Id: I100e99ee29bd04a90d0e417ff7cda55d7b645a99


Trivial merge