Merge "[Merge conflict resolved] [elm_colorpalette and elm_searchbar]: removal from...
authorshilpa singh <shilpa.singh@samsung.com>
Thu, 15 Mar 2012 09:09:31 +0000 (18:09 +0900)
committerGerrit Code Review <gerrit2@localhost>
Thu, 15 Mar 2012 09:09:31 +0000 (18:09 +0900)

Trivial merge