Merge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary
authorChunEon Park <chuneon.park@samsung.com>
Thu, 18 Aug 2011 13:04:54 +0000 (22:04 +0900)
committerChunEon Park <chuneon.park@samsung.com>
Thu, 18 Aug 2011 13:04:54 +0000 (22:04 +0900)

Trivial merge