Merge branch 'tizen_2.1' into tizen_2.2
authorKeebum Kim <keebum.kim@samsung.com>
Wed, 5 Jun 2013 08:14:58 +0000 (17:14 +0900)
committerKeebum Kim <keebum.kim@samsung.com>
Wed, 5 Jun 2013 08:14:58 +0000 (17:14 +0900)

Trivial merge