Merge branch 'master' of https://git.maemo.org/projects/mussorgsky
authorIvan Frade <ivan.frade@gmail.com>
Wed, 24 Jun 2009 21:13:20 +0000 (00:13 +0300)
committerIvan Frade <ivan.frade@gmail.com>
Wed, 24 Jun 2009 21:13:20 +0000 (00:13 +0300)
Conflicts:
src/edit_panel.py


Trivial merge