Merge branch 'master' into tizen_2.1
authorKim Gibyoung <lastkgb.kim@samsung.com>
Mon, 22 Apr 2013 12:03:26 +0000 (21:03 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Mon, 22 Apr 2013 12:06:50 +0000 (21:06 +0900)
Change-Id: I9ca0b18b96de9be5bbb9217e50511d65e60c2d23


Trivial merge