Merge "naviframe -"
authorWooHyun Jung <wh0705.jung@samsung.com>
Mon, 14 Nov 2011 11:16:33 +0000 (20:16 +0900)
committerGerrit Code Review <git@Maetan>
Mon, 14 Nov 2011 11:16:33 +0000 (20:16 +0900)

Trivial merge