Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorshilpa singh <shilpa.singh@samsung.com>
Wed, 15 Sep 2010 06:07:54 +0000 (15:07 +0900)
committershilpa singh <shilpa.singh@samsung.com>
Wed, 15 Sep 2010 06:07:54 +0000 (15:07 +0900)

Trivial merge