Merge branch 'genete_master'
authorCarlos Lopez <carlos@pcnuevo.(none)>
Sat, 1 Aug 2009 18:14:08 +0000 (20:14 +0200)
committerCarlos Lopez <carlos@pcnuevo.(none)>
Sat, 1 Aug 2009 18:14:08 +0000 (20:14 +0200)

Trivial merge