Merge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary
authorchuneon.park <chuneon.park@samsung.com>
Fri, 22 Apr 2011 06:11:13 +0000 (15:11 +0900)
committerchuneon.park <chuneon.park@samsung.com>
Fri, 22 Apr 2011 06:11:13 +0000 (15:11 +0900)

Trivial merge