Merge branch 'master' into tizen_2.2
authorgs86.lee <gs86.lee@samsung.com>
Tue, 20 Aug 2013 06:53:38 +0000 (15:53 +0900)
committergs86.lee <gs86.lee@samsung.com>
Tue, 20 Aug 2013 06:53:38 +0000 (15:53 +0900)

Trivial merge