Merge branch 'master' into tizen_2.1
authorKim Gibyoung <lastkgb.kim@samsung.com>
Fri, 3 May 2013 06:23:16 +0000 (15:23 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Fri, 3 May 2013 06:23:27 +0000 (15:23 +0900)
Change-Id: I0f2d0b940a017db22c37c142b3fb669a172ae2f2


Trivial merge