Merge branch 'master' into tizen_2.1
authorKim Gibyoung <lastkgb.kim@samsung.com>
Tue, 23 Apr 2013 08:16:25 +0000 (17:16 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Tue, 23 Apr 2013 08:16:35 +0000 (17:16 +0900)
Change-Id: I9ffef11bdfe7c0857e9eb906119ab0e28fad546d


Trivial merge