Merge branch 'development/profiledialog'
authorToni Jussila <toni.jussila@fudeco.com>
Thu, 6 May 2010 06:45:57 +0000 (09:45 +0300)
committerToni Jussila <toni.jussila@fudeco.com>
Thu, 6 May 2010 06:45:57 +0000 (09:45 +0300)

Trivial merge