Merge branch 'master' into tizen_2.0
authorKim Gibyoung <lastkgb.kim@samsung.com>
Sat, 2 Feb 2013 10:49:10 +0000 (19:49 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Sat, 2 Feb 2013 10:49:21 +0000 (19:49 +0900)
Change-Id: I6d1fb64c42e74bbb0c41d961b2db61e6d6492126


Trivial merge