Merge branch 'master' of jh0506.yun@165.213.180.234:/git/slp/pkgs/elementary
authorjh0506.yun <jh0506.yun@samsung.com>
Fri, 20 Aug 2010 05:09:53 +0000 (14:09 +0900)
committerjh0506.yun <jh0506.yun@samsung.com>
Fri, 20 Aug 2010 05:09:53 +0000 (14:09 +0900)

Trivial merge