Merge branch 'master' of ryuan.choi@165.213.180.234:/git/slp/pkgs/elementary
authorryuan choi <ryuan.choi@samsung.com>
Tue, 24 Aug 2010 02:50:45 +0000 (11:50 +0900)
committerryuan choi <ryuan.choi@samsung.com>
Tue, 24 Aug 2010 02:50:45 +0000 (11:50 +0900)

Trivial merge