Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorsangho park <sangho.g.park@samsung.com>
Tue, 12 Oct 2010 11:36:57 +0000 (20:36 +0900)
committersangho park <sangho.g.park@samsung.com>
Tue, 12 Oct 2010 11:36:57 +0000 (20:36 +0900)

Trivial merge