Merge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary
authorchuneon.park <chuneon.park@samsung.com>
Fri, 25 Mar 2011 08:13:34 +0000 (17:13 +0900)
committerchuneon.park <chuneon.park@samsung.com>
Fri, 25 Mar 2011 08:13:34 +0000 (17:13 +0900)

Trivial merge