Merge branch 'master' of https://git.maemo.org/projects/oespirit1
authorKirtika Ruchandani <kirtibr@gmail.com>
Sat, 13 Jun 2009 05:58:02 +0000 (11:28 +0530)
committerKirtika Ruchandani <kirtibr@gmail.com>
Sat, 13 Jun 2009 05:58:02 +0000 (11:28 +0530)

Trivial merge