Merge branch 'master' of ryuan.choi@165.213.180.234:/git/slp/pkgs/elementary
authorRyuan Choi <ryuan.choi@samsung.com>
Thu, 22 Jul 2010 12:03:10 +0000 (21:03 +0900)
committerRyuan Choi <ryuan.choi@samsung.com>
Thu, 22 Jul 2010 12:03:10 +0000 (21:03 +0900)

Trivial merge