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


Trivial merge