Merge branch 'registerdialog'
authorToni Jussila <toni.jussila@gmail.com>
Thu, 27 May 2010 07:07:19 +0000 (10:07 +0300)
committerToni Jussila <toni.jussila@gmail.com>
Thu, 27 May 2010 07:07:19 +0000 (10:07 +0300)

Trivial merge