Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary
authorshilpa singh <shilpa.singh@samsung.com>
Fri, 8 Oct 2010 15:32:03 +0000 (00:32 +0900)
committershilpa singh <shilpa.singh@samsung.com>
Fri, 8 Oct 2010 15:32:03 +0000 (00:32 +0900)

Trivial merge