Merge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary
authorChunEon Park <chuneon.park>
Fri, 11 Feb 2011 01:34:21 +0000 (10:34 +0900)
committerChunEon Park <chuneon.park>
Fri, 11 Feb 2011 01:34:21 +0000 (10:34 +0900)

Trivial merge