Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorChunEon Park <chuneon.park@samsung.com>
Wed, 8 Sep 2010 00:46:30 +0000 (09:46 +0900)
committerChunEon Park <chuneon.park@samsung.com>
Wed, 8 Sep 2010 00:46:30 +0000 (09:46 +0900)

Trivial merge