Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 6 Oct 2010 14:30:08 +0000 (23:30 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Wed, 6 Oct 2010 14:30:08 +0000 (23:30 +0900)

Trivial merge