Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorsanghoon80.cho <sanghoon80.cho@samsung.com>
Fri, 17 Sep 2010 02:58:57 +0000 (11:58 +0900)
committersanghoon80.cho <sanghoon80.cho@samsung.com>
Fri, 17 Sep 2010 02:58:57 +0000 (11:58 +0900)

Trivial merge