Merge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary
authorchuneon.park <chuneon.park@samsung.com>
Wed, 23 Mar 2011 05:01:25 +0000 (14:01 +0900)
committerchuneon.park <chuneon.park@samsung.com>
Wed, 23 Mar 2011 05:01:25 +0000 (14:01 +0900)

Trivial merge