Merge "[elm] add shots feature from upstream"
authorHyoyoung Chang <hyoyoung.chang@samsung.com>
Fri, 1 Jul 2011 07:23:47 +0000 (16:23 +0900)
committerGerrit Code Review <git@Maetan>
Fri, 1 Jul 2011 07:23:47 +0000 (16:23 +0900)

Trivial merge