Merge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary
authorChunEon Park <chuneon.park@samsung.com>
Fri, 7 Oct 2011 05:50:54 +0000 (14:50 +0900)
committerChunEon Park <chuneon.park@samsung.com>
Fri, 7 Oct 2011 05:50:54 +0000 (14:50 +0900)

Trivial merge