Merge "[*][factory] add from upstream elementary"
authorHyoyoung Chang <hyoyoung.chang@samsung.com>
Wed, 14 Sep 2011 10:14:22 +0000 (19:14 +0900)
committerGerrit Code Review <git@Maetan>
Wed, 14 Sep 2011 10:14:22 +0000 (19:14 +0900)

Trivial merge