Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorsumanth.m <sumanth.m@samsung.com>
Wed, 13 Oct 2010 10:07:24 +0000 (15:37 +0530)
committersumanth.m <sumanth.m@samsung.com>
Wed, 13 Oct 2010 10:07:24 +0000 (15:37 +0530)

Trivial merge