Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorJihoon Kim <jihoon48.kim@samsung.com>
Fri, 1 Oct 2010 10:47:51 +0000 (19:47 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Fri, 1 Oct 2010 10:47:51 +0000 (19:47 +0900)

Trivial merge