Merge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary
authorChunEon Park <chuneon.park@samsung.com>
Fri, 1 Jul 2011 08:29:39 +0000 (17:29 +0900)
committerChunEon Park <chuneon.park@samsung.com>
Fri, 1 Jul 2011 08:29:39 +0000 (17:29 +0900)

Trivial merge