Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorPrince Kr Dubey <prince.dubey@samsung.com>
Fri, 24 Sep 2010 11:37:41 +0000 (17:07 +0530)
committerPrince Kr Dubey <prince.dubey@samsung.com>
Fri, 24 Sep 2010 11:37:41 +0000 (17:07 +0530)

Trivial merge