Merge branch 'master' of ryuan.choi@165.213.180.234:/git/slp/pkgs/elementary
authorRyuan Choi <ryuan.choi@samsung.com>
Mon, 23 Aug 2010 07:10:57 +0000 (16:10 +0900)
committerRyuan Choi <ryuan.choi@samsung.com>
Mon, 23 Aug 2010 07:10:57 +0000 (16:10 +0900)

Trivial merge