Merge branch 'svn_merge' of 165.213.180.234:/slp/pkgs/e/elementary into svn_merge
authorChunEon Park <chuneon.park@samsung.com>
Thu, 14 Jul 2011 00:41:31 +0000 (09:41 +0900)
committerChunEon Park <chuneon.park@samsung.com>
Thu, 14 Jul 2011 00:41:31 +0000 (09:41 +0900)

Trivial merge