Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorChunEon Park <chuneon.park@samsung.com>
Tue, 31 Aug 2010 12:36:18 +0000 (21:36 +0900)
committerChunEon Park <chuneon.park@samsung.com>
Tue, 31 Aug 2010 12:36:18 +0000 (21:36 +0900)

Trivial merge