Merge branch 'genete_master'
authorCarlos Lopez <carlos@pcnuevo.(none)>
Fri, 19 Jun 2009 15:16:24 +0000 (17:16 +0200)
committerCarlos Lopez <carlos@pcnuevo.(none)>
Fri, 19 Jun 2009 15:16:24 +0000 (17:16 +0200)

Trivial merge