Merge branch 'genete_master'
authorCarlos Lopez <genetita@gmail.com>
Sat, 23 Jan 2010 09:48:12 +0000 (10:48 +0100)
committerCarlos Lopez <genetita@gmail.com>
Sat, 23 Jan 2010 09:48:12 +0000 (10:48 +0100)

Trivial merge