Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorWooHyun Jung <wh0705.jung@samsung.com>
Wed, 11 Aug 2010 15:35:20 +0000 (00:35 +0900)
committerWooHyun Jung <wh0705.jung@samsung.com>
Wed, 11 Aug 2010 15:35:20 +0000 (00:35 +0900)

Trivial merge