Merge branch 'master' of jh0506.yun@165.213.180.234:/git/slp/pkgs/elementary
authorjh0506.yun <jh0506.yun@samsung.com>
Thu, 15 Jul 2010 12:00:59 +0000 (21:00 +0900)
committerjh0506.yun <jh0506.yun@samsung.com>
Thu, 15 Jul 2010 12:00:59 +0000 (21:00 +0900)

Trivial merge