Merge branch 'master' into tizen_2.0
authorKim Gibyoung <lastkgb.kim@samsung.com>
Fri, 1 Feb 2013 16:04:08 +0000 (01:04 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Fri, 1 Feb 2013 16:04:18 +0000 (01:04 +0900)
Change-Id: I3f623df23985147ca208b5a7aa778a2c7b9f9eaf


Trivial merge