Merge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary
authorChunEon Park <chuneon.park@samsung.com>
Tue, 16 Aug 2011 09:14:44 +0000 (18:14 +0900)
committerChunEon Park <chuneon.park@samsung.com>
Tue, 16 Aug 2011 09:14:44 +0000 (18:14 +0900)

Trivial merge