Merge branch 'master' into tizen_2.1
authorKim Gibyoung <lastkgb.kim@samsung.com>
Wed, 8 May 2013 12:25:33 +0000 (21:25 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Wed, 8 May 2013 12:25:33 +0000 (21:25 +0900)

Trivial merge