Merge branch 'master' into genete_setup_dialog
authorCarlos Lopez <carlos@pcnuevo.(none)>
Sat, 20 Jun 2009 12:15:37 +0000 (14:15 +0200)
committerCarlos Lopez <carlos@pcnuevo.(none)>
Sat, 20 Jun 2009 12:15:37 +0000 (14:15 +0200)

Trivial merge