Merge "naviframe - merged with opensource"
authorChunEon Park <chuneon.park@samsung.com>
Mon, 19 Dec 2011 08:37:30 +0000 (17:37 +0900)
committerGerrit Code Review <gerrit2@localhost>
Mon, 19 Dec 2011 08:37:30 +0000 (17:37 +0900)

Trivial merge