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

Trivial merge