Merge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary
authorChunEon Park <chuneon.park@samsung.com>
Tue, 28 Jun 2011 10:41:54 +0000 (19:41 +0900)
committerChunEon Park <chuneon.park@samsung.com>
Tue, 28 Jun 2011 10:41:54 +0000 (19:41 +0900)

Trivial merge