Merge branch 'master' into tizen_2.1
authorKim Gibyoung <lastkgb.kim@samsung.com>
Mon, 6 May 2013 15:32:06 +0000 (00:32 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Mon, 6 May 2013 15:37:39 +0000 (00:37 +0900)
Change-Id: I07d8060d6bb7555ad5214b03be873711b68699f3


Trivial merge