Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorSohyun Kim <anna1014.kim@samsung.com>
Tue, 17 Aug 2010 10:31:56 +0000 (19:31 +0900)
committerSohyun Kim <anna1014.kim@samsung.com>
Tue, 17 Aug 2010 10:31:56 +0000 (19:31 +0900)

Trivial merge