Merge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary
authorchuneon.park <chuneon.park@samsung.com>
Thu, 24 Mar 2011 12:01:37 +0000 (21:01 +0900)
committerchuneon.park <chuneon.park@samsung.com>
Thu, 24 Mar 2011 12:01:37 +0000 (21:01 +0900)

Trivial merge