Merge branch 'master' of eunmi15.lee@165.213.180.234:/git/slp/pkgs/elementary
authorEunmi Lee <eunmi15.lee@samsung.com>
Thu, 30 Sep 2010 06:21:11 +0000 (15:21 +0900)
committerEunmi Lee <eunmi15.lee@samsung.com>
Thu, 30 Sep 2010 06:21:11 +0000 (15:21 +0900)

Trivial merge