Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/edje
authorGovindaraju SM <govi.sm@samsung.com>
Tue, 28 Sep 2010 10:36:07 +0000 (16:06 +0530)
committerGovindaraju SM <govi.sm@samsung.com>
Tue, 28 Sep 2010 10:36:07 +0000 (16:06 +0530)

Trivial merge