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

Trivial merge