Merge branch 'tizen_2.1' into tizen_2.2
authorJi-hoon Lee <dalton.lee@samsung.com>
Wed, 5 Jun 2013 06:09:20 +0000 (15:09 +0900)
committerJi-hoon Lee <dalton.lee@samsung.com>
Wed, 5 Jun 2013 06:09:20 +0000 (15:09 +0900)

Trivial merge