Merge "[Merge conflict resolved] [Naviframe, Search, Progressbar]: GUIv1.5 changes...
authorshilpa singh <shilpa.singh@samsung.com>
Wed, 25 Apr 2012 10:16:50 +0000 (19:16 +0900)
committerGerrit Code Review <gerrit2@localhost>
Wed, 25 Apr 2012 10:16:50 +0000 (19:16 +0900)

Trivial merge