Merge branch 'genete_setup_dialog'
authorCarlos Lopez <carlos@pcnuevo.(none)>
Mon, 29 Jun 2009 15:51:11 +0000 (17:51 +0200)
committerCarlos Lopez <carlos@pcnuevo.(none)>
Mon, 29 Jun 2009 15:51:11 +0000 (17:51 +0200)

Trivial merge