Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorSohyun Kim <anna1014.kim@samsung.com>
Fri, 20 Aug 2010 09:49:32 +0000 (18:49 +0900)
committerSohyun Kim <anna1014.kim@samsung.com>
Fri, 20 Aug 2010 09:49:32 +0000 (18:49 +0900)

Trivial merge