Merge branch 'genete_master'
authorCarlos Lopez <genetita@gmail.com>
Tue, 16 Feb 2010 15:34:03 +0000 (16:34 +0100)
committerCarlos Lopez <genetita@gmail.com>
Tue, 16 Feb 2010 15:34:03 +0000 (16:34 +0100)

Trivial merge