Merge branch 'master' of 165.213.180.234:slp/pkgs/e/elementary
authorShilpa Singh <shilpa.singh@samsung.com>
Thu, 20 Jan 2011 09:07:08 +0000 (14:37 +0530)
committerShilpa Singh <shilpa.singh@samsung.com>
Thu, 20 Jan 2011 09:07:08 +0000 (14:37 +0530)

Trivial merge