Merge branch 'master' of 165.213.180.234:slp/pkgs/e/elementary
authorShilpa Singh <shilpa.singh@samsung.com>
Tue, 25 Jan 2011 06:08:47 +0000 (11:38 +0530)
committerShilpa Singh <shilpa.singh@samsung.com>
Tue, 25 Jan 2011 06:08:47 +0000 (11:38 +0530)

Trivial merge