Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorshilpa singh <shilpa.singh@samsung.com>
Tue, 28 Sep 2010 13:43:25 +0000 (22:43 +0900)
committershilpa singh <shilpa.singh@samsung.com>
Tue, 28 Sep 2010 13:43:25 +0000 (22:43 +0900)

Trivial merge