Merge branch 'master' of 165.213.180.234:slp/pkgs/e/elementary
authorsangho park <sangho.g.park@samsung.com>
Tue, 11 Jan 2011 08:26:12 +0000 (17:26 +0900)
committersangho park <sangho.g.park@samsung.com>
Tue, 11 Jan 2011 08:26:12 +0000 (17:26 +0900)

Trivial merge