Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorChunEon Park <chuneon.park@samsung.com>
Thu, 11 Nov 2010 11:48:04 +0000 (20:48 +0900)
committerChunEon Park <chuneon.park@samsung.com>
Thu, 11 Nov 2010 11:48:04 +0000 (20:48 +0900)

Trivial merge