Merge branch 'master' of jae.hwan.kim@165.213.180.234:/git/slp/pkgs/elementary
authorjaehwan <jae.hwan.kim@samsung.com>
Tue, 20 Jul 2010 02:52:58 +0000 (11:52 +0900)
committerjaehwan <jae.hwan.kim@samsung.com>
Tue, 20 Jul 2010 02:52:58 +0000 (11:52 +0900)

Trivial merge