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


Trivial merge