Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorjh0506.yun <jh0506.yun@samsung.com>
Thu, 4 Nov 2010 08:23:17 +0000 (17:23 +0900)
committerjh0506.yun <jh0506.yun@samsung.com>
Thu, 4 Nov 2010 08:23:17 +0000 (17:23 +0900)

Trivial merge