Merge branch 'master' of jae.hwan.kim@165.213.180.234:/git/slp/pkgs/elementary
authorJeahwan Kim <jae.hwan.kim@samsung.com>
Wed, 22 Sep 2010 10:58:33 +0000 (19:58 +0900)
committerJeahwan Kim <jae.hwan.kim@samsung.com>
Wed, 22 Sep 2010 10:58:33 +0000 (19:58 +0900)

Trivial merge