Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorSohyun Kim <anna1014.kim@samsung.com>
Thu, 2 Sep 2010 12:22:24 +0000 (21:22 +0900)
committerSohyun Kim <anna1014.kim@samsung.com>
Thu, 2 Sep 2010 12:22:24 +0000 (21:22 +0900)

Trivial merge