Merge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary
authorChunEon Park <chuneon.park@samsung.com>
Sat, 13 Aug 2011 08:11:07 +0000 (17:11 +0900)
committerChunEon Park <chuneon.park@samsung.com>
Sat, 13 Aug 2011 08:11:07 +0000 (17:11 +0900)

Trivial merge