Merge branch 'master' of prince.dubey@165.213.180.234:/git/slp/pkgs/elementary
authorPrince Kumar Dubey <prince.dubey@samsung.com>
Thu, 5 Aug 2010 09:01:34 +0000 (14:31 +0530)
committerPrince Kumar Dubey <prince.dubey@samsung.com>
Thu, 5 Aug 2010 09:01:34 +0000 (14:31 +0530)

Trivial merge