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

Trivial merge