Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorWooHyun Jung <wh0705.jung@samsung.com>
Thu, 4 Nov 2010 12:05:56 +0000 (21:05 +0900)
committerWooHyun Jung <wh0705.jung@samsung.com>
Thu, 4 Nov 2010 12:05:56 +0000 (21:05 +0900)

Trivial merge