Merge branch 'master' into tizen_2.1
authorKim Gibyoung <lastkgb.kim@samsung.com>
Tue, 30 Apr 2013 02:41:29 +0000 (11:41 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Tue, 30 Apr 2013 02:41:40 +0000 (11:41 +0900)
Change-Id: Ia7ad9f72dbea631aa4043ac3b01bbcc91b837e55


Trivial merge