Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorPrince Kr Dubey <prince.dubey@samsung.com>
Fri, 26 Nov 2010 07:01:29 +0000 (16:01 +0900)
committerPrince Kr Dubey <prince.dubey@samsung.com>
Fri, 26 Nov 2010 07:01:29 +0000 (16:01 +0900)

Trivial merge