Merge branch 'tizen_2.1' of ssh://tizendev.org:29418/framework/osp/appfw into tizen_2.1
authorJoohyun Kim <joohyune.kim@samsung.com>
Tue, 14 May 2013 04:37:33 +0000 (13:37 +0900)
committerJoohyun Kim <joohyune.kim@samsung.com>
Tue, 14 May 2013 04:37:33 +0000 (13:37 +0900)

Trivial merge