Merge "[conformant] remove part: elm.swallow.shelf"
authorShinwoo Kim <cinoo.kim@samsung.com>
Thu, 28 Apr 2011 10:29:44 +0000 (19:29 +0900)
committerGerrit Code Review <git@Maetan>
Thu, 28 Apr 2011 10:29:44 +0000 (19:29 +0900)

Trivial merge